diff options
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 5942eadab..40ab80856 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -89,13 +89,15 @@ public class ImportKeysActivity extends SherlockFragmentActivity { */ @Override public boolean onCreateOptionsMenu(Menu menu) { - menu.add(1, Id.menu.option.import_from_file, 0, R.string.menu_importFromFile) + menu.add(1, Id.menu.option.key_server, 0, R.string.menu_keyServer).setShowAsAction( + MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + menu.add(1, Id.menu.option.import_from_file, 1, R.string.menu_importFromFile) .setShowAsAction( MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); - menu.add(1, Id.menu.option.import_from_qr_code, 1, R.string.menu_importFromQrCode) + menu.add(1, Id.menu.option.import_from_qr_code, 2, R.string.menu_importFromQrCode) .setShowAsAction( MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); - menu.add(1, Id.menu.option.import_from_nfc, 2, R.string.menu_importFromNfc) + menu.add(1, Id.menu.option.import_from_nfc, 3, R.string.menu_importFromNfc) .setShowAsAction( MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); @@ -113,6 +115,11 @@ public class ImportKeysActivity extends SherlockFragmentActivity { startActivity(intent); return true; + case Id.menu.option.key_server: + startActivityForResult(new Intent(this, KeyServerQueryActivity.class), 0); + + return true; + case Id.menu.option.import_from_file: showImportFromFileDialog(); return true; |