Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-02 00:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to utilize main activity instead of passthrough.

Browse Source
This commit is contained in:
Alex Hart
2026-03-24 16:43:47 -03:00
committed by Cody Henthorne
parent 4d301a4f66
commit d97bde3959
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
View File

@@ -11,7 +11,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.badges.models.Badge;
import org.thoughtcrime.securesms.conversation.v2.ConversationActivity;
import org.thoughtcrime.securesms.MainActivity;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.ThreadTable;
import org.signal.core.models.media.Media;
@@ -94,13 +94,15 @@ public class ConversationIntents {
*/
public static @NonNull Builder createBuilderSync(@NonNull Context context, @NonNull RecipientId recipientId, long threadId) {
Preconditions.checkArgument(threadId > 0, "threadId is invalid");
return new Builder(context, ConversationActivity.class, recipientId, threadId, ConversationScreenType.NORMAL);
return new Builder(context, MainActivity.class, recipientId, threadId, ConversationScreenType.NORMAL)
.withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
}
public static @NonNull Builder createBuilderSync(@NonNull Context context, @NonNull ConversationArgs conversationArgs) {
Preconditions.checkArgument(conversationArgs.threadId > 0, "threadId is invalid");
return new Builder(context, ConversationActivity.class, conversationArgs.getRecipientId(), conversationArgs.threadId, ConversationScreenType.NORMAL)
.withArgs(conversationArgs);
return new Builder(context, MainActivity.class, conversationArgs.getRecipientId(), conversationArgs.threadId, ConversationScreenType.NORMAL)
.withArgs(conversationArgs)
.withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
}
static @Nullable Uri getIntentData(@NonNull Bundle bundle) {
@@ -195,6 +197,7 @@ public class ConversationIntents {
private Badge giftBadge;
private long shareDataTimestamp = -1L;
private boolean incognito;
private int flags;
private Builder(@NonNull Context context,
@NonNull Class<? extends Activity> conversationActivityClass,
@@ -292,6 +295,11 @@ public class ConversationIntents {
return this;
}
public @NonNull Builder withFlags(int flags) {
this.flags = flags;
return this;
}
public @NonNull ConversationArgs toConversationArgs() {
return new ConversationArgs(
recipientId,
@@ -321,6 +329,10 @@ public class ConversationIntents {
Intent intent = new Intent(context, conversationActivityClass);
intent.setAction(ConversationIntents.ACTION);
if (flags != 0) {
intent.addFlags(flags);
}
if (conversationScreenType.isInBubble()) {
intent.setData(new Uri.Builder().authority(BUBBLE_AUTHORITY)
.appendQueryParameter(EXTRA_RECIPIENT, recipientId.serialize())