diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-09 16:05:47 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-09 16:05:47 +0200 |
commit | 19b62d67b33ae172322ca8d6502973c3f9cdae0c (patch) | |
tree | 241a2fde88ba2c9059f21d8759389f42a17aad9d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
parent | a0a51c9f929b90327feb117d7ba01544aee4f50b (diff) | |
download | open-keychain-19b62d67b33ae172322ca8d6502973c3f9cdae0c.tar.gz open-keychain-19b62d67b33ae172322ca8d6502973c3f9cdae0c.tar.bz2 open-keychain-19b62d67b33ae172322ca8d6502973c3f9cdae0c.zip |
Fix NFC
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 6ea79473a..46da6257a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -93,6 +93,11 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O ImportKeysClipboardFragment.class, ImportKeysNFCFragment.class }; + private static final int NAV_SERVER = 0; + private static final int NAV_FILE = 1; + private static final int NAV_QR_CODE = 2; + private static final int NAV_CLIPBOARD = 3; + private static final int NAV_NFC = 4; private int mCurrentNavPosition = -1; @@ -152,7 +157,7 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O /* Keychain's own Actions */ // display file fragment - loadNavFragment(1, null); + loadNavFragment(NAV_FILE, null); if (dataUri != null) { // action: directly load data @@ -187,7 +192,7 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O // display keyserver fragment with query Bundle args = new Bundle(); args.putString(ImportKeysServerFragment.ARG_QUERY, query); - loadNavFragment(0, args); + loadNavFragment(NAV_SERVER, args); // action: search immediately startListFragment(savedInstanceState, null, null, query); @@ -212,7 +217,7 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O } else if (ACTION_IMPORT_KEY_FROM_FILE.equals(action)) { // NOTE: this only displays the appropriate fragment, no actions are taken - loadNavFragment(1, null); + loadNavFragment(NAV_FILE, null); // no immediate actions! startListFragment(savedInstanceState, null, null, null); @@ -220,14 +225,14 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O // also exposed in AndroidManifest // NOTE: this only displays the appropriate fragment, no actions are taken - loadNavFragment(2, null); + loadNavFragment(NAV_QR_CODE, null); // no immediate actions! startListFragment(savedInstanceState, null, null, null); } else if (ACTION_IMPORT_KEY_FROM_NFC.equals(action)) { // NOTE: this only displays the appropriate fragment, no actions are taken - loadNavFragment(3, null); + loadNavFragment(NAV_NFC, null); // no immediate actions! startListFragment(savedInstanceState, null, null, null); @@ -327,7 +332,7 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O Bundle args = new Bundle(); args.putString(ImportKeysServerFragment.ARG_QUERY, query); args.putBoolean(ImportKeysServerFragment.ARG_DISABLE_QUERY_EDIT, true); - loadNavFragment(0, args); + loadNavFragment(NAV_SERVER, args); // action: search directly startListFragment(savedInstanceState, null, null, query); |