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

Distinguish request and result codes of different activities.

Browse Source
This commit is contained in:
akwizgran
2014-02-05 15:03:28 +00:00
parent 8d850b290c
commit 843ad55163
8 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ public class BriarActivity extends RoboFragmentActivity {
// This build expires on 7 February 2014
private static final long EXPIRY_DATE = 1391731200 * 1000L;
private static final int PASSWORD_REQUEST_CODE = 1;
private static final int REQUEST_PASSWORD = 1;
private static final Logger LOG =
Logger.getLogger(BriarActivity.class.getName());
@@ -45,7 +45,7 @@ public class BriarActivity extends RoboFragmentActivity {
if(LOG.isLoggable(INFO)) LOG.info("No password");
Intent i = new Intent(this, PasswordActivity.class);
i.setFlags(FLAG_ACTIVITY_NO_ANIMATION);
startActivityForResult(i, PASSWORD_REQUEST_CODE);
startActivityForResult(i, REQUEST_PASSWORD);
} else {
startAndBindService();
}
@@ -53,7 +53,8 @@ public class BriarActivity extends RoboFragmentActivity {
@Override
public void onActivityResult(int request, int result, Intent data) {
if(request == PASSWORD_REQUEST_CODE) {
super.onActivityResult(request, result, data);
if(request == REQUEST_PASSWORD) {
if(result == RESULT_OK) startAndBindService();
else finish();
}