empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Restart activity in onNewIntent if activity is not yet initialized.

Browse source
This commit is contained in:
Alex Hart 2021-03-16 11:37:40 -03:00 • committed by GitHub
parent 490944a02a
commit 0c535904fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View file

@ -400,6 +400,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
private boolean isMmsEnabled = true; private boolean isMmsEnabled = true;
private boolean isSecurityInitialized = false; private boolean isSecurityInitialized = false;
private volatile boolean screenInitialized = false;
private IdentityRecordList identityRecords = new IdentityRecordList(Collections.emptyList()); private IdentityRecordList identityRecords = new IdentityRecordList(Collections.emptyList());
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme(); private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
private final DynamicLanguage dynamicLanguage = new DynamicLanguage(); private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
@ -449,6 +451,11 @@ public class ConversationActivity extends PassphraseRequiredActivity
initializeSecurity(recipient.get().isRegistered(), isDefaultSms).addListener(new AssertedSuccessListener<Boolean>() { initializeSecurity(recipient.get().isRegistered(), isDefaultSms).addListener(new AssertedSuccessListener<Boolean>() {
@Override @Override
public void onSuccess(Boolean result) { public void onSuccess(Boolean result) {
if (isFinishing()) {
Log.w(TAG, "Activity is finishing. Not proceeding with initialization.");
return;
}
initializeProfiles(); initializeProfiles();
initializeGv1Migration(); initializeGv1Migration();
initializeDraft(args).addListener(new AssertedSuccessListener<Boolean>() { initializeDraft(args).addListener(new AssertedSuccessListener<Boolean>() {
@ -469,6 +476,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
composeText.addTextChangedListener(typingTextWatcher); composeText.addTextChangedListener(typingTextWatcher);
} }
composeText.setSelection(composeText.length(), composeText.length()); composeText.setSelection(composeText.length(), composeText.length());
screenInitialized = true;
} }
}); });
} }
@ -486,6 +495,13 @@ public class ConversationActivity extends PassphraseRequiredActivity
return; return;
} }
if (!screenInitialized) {
Log.w(TAG, "Activity is in the middle of initialization. Restarting.");
finish();
startActivity(intent);
return;
}
reactWithAnyEmojiStartPage = -1; reactWithAnyEmojiStartPage = -1;
if (!Util.isEmpty(composeText) || attachmentManager.isAttachmentPresent() || inputPanel.getQuote().isPresent()) { if (!Util.isEmpty(composeText) || attachmentManager.isAttachmentPresent() || inputPanel.getQuote().isPresent()) {
saveDraft(); saveDraft();