diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-27 17:56:52 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-27 17:56:52 +0200 |
commit | dab540e121d622236dd723e31b611624ffb976ef (patch) | |
tree | 0f964fa755ad3ad3602dcb3519dec5dd3c3f53a6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java | |
parent | 45722d7cfbb2996ff994b3f2143e5871c2e564ba (diff) | |
download | open-keychain-dab540e121d622236dd723e31b611624ffb976ef.tar.gz open-keychain-dab540e121d622236dd723e31b611624ffb976ef.tar.bz2 open-keychain-dab540e121d622236dd723e31b611624ffb976ef.zip |
Work on first time wizard design
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java index 4271b2d5a..a764d78c2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java @@ -24,8 +24,10 @@ import android.view.View; import android.view.Window; import android.widget.Button; +import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.Preferences; +import org.sufficientlysecure.keychain.util.Log; public class FirstTimeActivity extends ActionBarActivity { @@ -33,6 +35,8 @@ public class FirstTimeActivity extends ActionBarActivity { Button mImportKey; Button mSkipSetup; + public static final int REQUEST_CODE_CREATE_OR_IMPORT_KEY = 0x00007012; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -57,7 +61,7 @@ public class FirstTimeActivity extends ActionBarActivity { public void onClick(View v) { Intent intent = new Intent(FirstTimeActivity.this, ImportKeysActivity.class); intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN); - startActivityForResult(intent, 1); + startActivityForResult(intent, REQUEST_CODE_CREATE_OR_IMPORT_KEY); } }); @@ -65,7 +69,7 @@ public class FirstTimeActivity extends ActionBarActivity { @Override public void onClick(View v) { Intent intent = new Intent(FirstTimeActivity.this, CreateKeyActivity.class); - startActivityForResult(intent, 1); + startActivityForResult(intent, REQUEST_CODE_CREATE_OR_IMPORT_KEY); } }); @@ -75,8 +79,12 @@ public class FirstTimeActivity extends ActionBarActivity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - finishSetup(); + if (requestCode == REQUEST_CODE_CREATE_OR_IMPORT_KEY) { + if (resultCode == RESULT_OK) { + finishSetup(); + } + } else { + Log.e(Constants.TAG, "No valid request code!"); } } |