Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 20:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load drafts from DB when opening conversation from notifications.

Browse Source
This commit is contained in:
clark-signal
2023-01-09 14:10:10 -05:00
committed by Alex Hart
parent aac1d0cedb
commit 87c366223a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import java.util.Objects;
public class ConversationIntents { public class ConversationIntents {
private static final String BUBBLE_AUTHORITY = "bubble"; private static final String BUBBLE_AUTHORITY = "bubble";
private static final String NOTIFICATION_CUSTOM_SCHEME = "custom";
private static final String EXTRA_RECIPIENT = "recipient_id"; private static final String EXTRA_RECIPIENT = "recipient_id";
private static final String EXTRA_THREAD_ID = "thread_id"; private static final String EXTRA_THREAD_ID = "thread_id";
private static final String EXTRA_TEXT = "draft_text"; private static final String EXTRA_TEXT = "draft_text";
@@ -89,6 +90,10 @@ public class ConversationIntents {
return uri != null && Objects.equals(uri.getAuthority(), BUBBLE_AUTHORITY); return uri != null && Objects.equals(uri.getAuthority(), BUBBLE_AUTHORITY);
} }
static boolean isNotificationIntentUri(@Nullable Uri uri) {
return uri != null && Objects.equals(uri.getScheme(), NOTIFICATION_CUSTOM_SCHEME);
}
final static class Args { final static class Args {
private final RecipientId recipientId; private final RecipientId recipientId;
private final long threadId; private final long threadId;

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -1684,7 +1684,7 @@ public class ConversationParentFragment extends Fragment
return setMedia(draftMedia, draftMediaType); return setMedia(draftMedia, draftMediaType);
} }
if (draftText == null && (draftMedia == null || ConversationIntents.isBubbleIntentUri(draftMedia)) && draftMediaType == null) { if (draftText == null && (draftMedia == null || ConversationIntents.isBubbleIntentUri(draftMedia) || ConversationIntents.isNotificationIntentUri(draftMedia)) && draftMediaType == null) {
Log.d(TAG, "Initializing draft from database"); Log.d(TAG, "Initializing draft from database");
return initializeDraftFromDatabase(); return initializeDraftFromDatabase();
} else { } else {