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

Ensure share intents are not re-used for draft data.

Browse Source
This commit is contained in:
Alex Hart
2022-07-18 12:41:05 -03:00
parent f9c0156757
commit c9e1607987
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,6 +454,7 @@ public class ConversationParentFragment extends Fragment
private boolean isMmsEnabled = true;
private boolean isSecurityInitialized = false;
private boolean isSearchRequested = false;
private boolean hasProcessedShareData = false;
private final LifecycleDisposable disposables = new LifecycleDisposable();
private final Debouncer optionsMenuDebouncer = new Debouncer(50);
@@ -519,6 +520,10 @@ public class ConversationParentFragment extends Fragment
final boolean typingIndicatorsEnabled = TextSecurePreferences.isTypingIndicatorsEnabled(requireContext());
if (savedInstanceState != null) {
hasProcessedShareData = savedInstanceState.getBoolean("SHARED", false);
}
initializeReceivers();
initializeViews(view);
updateWallpaper(args.getWallpaper());
@@ -549,6 +554,8 @@ public class ConversationParentFragment extends Fragment
initializeProfiles();
initializeGv1Migration();
Log.d(TAG, "Initializing data from onViewCreated...");
initializeDraft(args).addListener(new AssertedSuccessListener<Boolean>() {
@Override
public void onSuccess(Boolean loadedDraft) {
@@ -635,10 +642,13 @@ public class ConversationParentFragment extends Fragment
reportShortcutLaunch(viewModel.getArgs().getRecipientId());
initializeResources(viewModel.getArgs());
initializeSecurity(recipient.get().isRegistered(), isDefaultSms).addListener(new AssertedSuccessListener<Boolean>() {
@Override
public void onSuccess(Boolean result) {
if (getContext() != null) {
Log.d(TAG, "Initializing draft from new intent...");
hasProcessedShareData = false;
initializeDraft(viewModel.getArgs());
}
}
@@ -886,6 +896,7 @@ public class ConversationParentFragment extends Fragment
outState.putInt(STATE_REACT_WITH_ANY_PAGE, reactWithAnyEmojiStartPage);
outState.putBoolean(STATE_IS_SEARCH_REQUESTED, isSearchRequested);
outState.putBoolean("SHARED", hasProcessedShareData);
}
@Override
@@ -1657,6 +1668,12 @@ public class ConversationParentFragment extends Fragment
private ListenableFuture<Boolean> initializeDraft(@NonNull ConversationIntents.Args args) {
final SettableFuture<Boolean> result = new SettableFuture<>();
if (hasProcessedShareData) {
Log.d(TAG, "Already processed this share data. Skipping.");
result.set(false);
return result;
}
final CharSequence draftText = args.getDraftText();
final Uri draftMedia = requireActivity().getIntent().getData();
final String draftContentType = requireActivity().getIntent().getType();
@@ -1665,6 +1682,8 @@ public class ConversationParentFragment extends Fragment
final StickerLocator stickerLocator = args.getStickerLocator();
final boolean borderless = args.isBorderless();
hasProcessedShareData = true;
if (stickerLocator != null && draftMedia != null) {
Log.d(TAG, "Handling shared sticker.");
sendSticker(stickerLocator, Objects.requireNonNull(draftContentType), draftMedia, 0, true);
@@ -1672,6 +1691,7 @@ public class ConversationParentFragment extends Fragment
}
if (draftMedia != null && draftContentType != null && borderless) {
Log.d(TAG, "Handling borderless draft media with content type " + draftContentType);
SimpleTask.run(getLifecycle(),
() -> getKeyboardImageDetails(draftMedia),
details -> sendKeyboardImage(draftMedia, draftContentType, details));