Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Don't create duplicate PasswordActivity when screen is rotated. Bug #43

Browse Source
This commit is contained in:
akwizgran
2014-02-26 22:45:07 +00:00
parent e479bf0a4d
commit d21ced30ba
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
briar-android/src/org/briarproject/android/BriarActivity.java
View File

@@ -33,14 +33,7 @@ public class BriarActivity extends RoboFragmentActivity {
@Override @Override
public void onCreate(Bundle state) { public void onCreate(Bundle state) {
super.onCreate(state); super.onCreate(state);
if(databaseConfig.getEncryptionKey() == null) { if(databaseConfig.getEncryptionKey() != null) startAndBindService();
if(LOG.isLoggable(INFO)) LOG.info("No password");
Intent i = new Intent(this, PasswordActivity.class);
i.setFlags(FLAG_ACTIVITY_NO_ANIMATION | FLAG_ACTIVITY_SINGLE_TOP);
startActivityForResult(i, REQUEST_PASSWORD);
} else {
startAndBindService();
}
} }
@Override @Override
@@ -52,6 +45,16 @@ public class BriarActivity extends RoboFragmentActivity {
} }
} }
@Override
public void onResume() {
super.onResume();
if(databaseConfig.getEncryptionKey() == null && !isFinishing()) {
Intent i = new Intent(this, PasswordActivity.class);
i.setFlags(FLAG_ACTIVITY_NO_ANIMATION | FLAG_ACTIVITY_SINGLE_TOP);
startActivityForResult(i, REQUEST_PASSWORD);
}
}
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();