TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-25 18:17:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move experience upgrade after passphrase and registration

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-09-25 09:32:44 -07:00
parent a39d9bf132
commit 009c01fd7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
View File

@ -151,14 +151,14 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
private int getApplicationState(MasterSecret masterSecret) { private int getApplicationState(MasterSecret masterSecret) {
if (!MasterSecretUtil.isPassphraseInitialized(this)) { if (!MasterSecretUtil.isPassphraseInitialized(this)) {
return STATE_CREATE_PASSPHRASE; return STATE_CREATE_PASSPHRASE;
} else if (ExperienceUpgradeActivity.isUpdate(this)) {
return STATE_EXPERIENCE_UPGRADE;
} else if (masterSecret == null) { } else if (masterSecret == null) {
return STATE_PROMPT_PASSPHRASE; return STATE_PROMPT_PASSPHRASE;
} else if (DatabaseUpgradeActivity.isUpdate(this)) { } else if (DatabaseUpgradeActivity.isUpdate(this)) {
return STATE_UPGRADE_DATABASE; return STATE_UPGRADE_DATABASE;
} else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) { } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
return STATE_PROMPT_PUSH_REGISTRATION; return STATE_PROMPT_PUSH_REGISTRATION;
} else if (ExperienceUpgradeActivity.isUpdate(this)) {
return STATE_EXPERIENCE_UPGRADE;
} else { } else {
return STATE_NORMAL; return STATE_NORMAL;
} }