diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-04 16:02:18 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-04 16:02:18 +0200 |
commit | 7e5918efa36e3a2f8c34868d8e17c80b2ef1eac1 (patch) | |
tree | 0922b17b327a0cc7be149b15cd369457779b91c3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | |
parent | d004bf236bd51817adf5963a3f970acd4e5a243e (diff) | |
parent | 7891560fc2ab46951d952b0ed9000fe007a4fe10 (diff) | |
download | open-keychain-7e5918efa36e3a2f8c34868d8e17c80b2ef1eac1.tar.gz open-keychain-7e5918efa36e3a2f8c34868d8e17c80b2ef1eac1.tar.bz2 open-keychain-7e5918efa36e3a2f8c34868d8e17c80b2ef1eac1.zip |
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java index f06531b01..5eef319c0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java @@ -84,7 +84,7 @@ public class KeyListActivity extends DrawerActivity { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.menu_key_list_add: - importKeys(); + addKeys(); return true; case R.id.menu_key_list_create: @@ -139,8 +139,8 @@ public class KeyListActivity extends DrawerActivity { } } - private void importKeys() { - Intent intent = new Intent(this, ImportKeysActivity.class); + private void addKeys() { + Intent intent = new Intent(this, AddKeysActivity.class); startActivityForResult(intent, 0); } |