TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent double screen lock intent from firing

Browse Source 
Fixes #7475
This commit is contained in:
Moxie Marlinspike 2018-03-08 17:41:27 -08:00
parent a2d04f4806
commit 29fcce23b1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
View File

@ -81,6 +81,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
private CancellationSignal fingerprintCancellationSignal; private CancellationSignal fingerprintCancellationSignal;
private FingerprintListener fingerprintListener; private FingerprintListener fingerprintListener;
private boolean authenticated;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
Log.w(TAG, "onCreate()"); Log.w(TAG, "onCreate()");
@ -100,7 +102,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
dynamicTheme.onResume(this); dynamicTheme.onResume(this);
dynamicLanguage.onResume(this); dynamicLanguage.onResume(this);
if (TextSecurePreferences.isScreenLockEnabled(this)) { if (TextSecurePreferences.isScreenLockEnabled(this) && !authenticated) {
resumeScreenLock(); resumeScreenLock();
} }
} }
@ -172,6 +174,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
private void handleAuthenticated() { private void handleAuthenticated() {
try { try {
authenticated = true;
MasterSecret masterSecret = MasterSecretUtil.getMasterSecret(this, MasterSecretUtil.UNENCRYPTED_PASSPHRASE); MasterSecret masterSecret = MasterSecretUtil.getMasterSecret(this, MasterSecretUtil.UNENCRYPTED_PASSPHRASE);
setMasterSecret(masterSecret); setMasterSecret(masterSecret);
} catch (InvalidPassphraseException e) { } catch (InvalidPassphraseException e) {