aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-09-04 20:12:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2013-09-04 20:12:58 +0200
commitc3b49a318f82238245f6c40b7a8abda01cb9433d (patch)
treeea90be853c13c0f4f654c0148cb326a91e2631d7 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui
parent7cca7b1ffa416a354c08e1cb6b5776ae55fc19ab (diff)
downloadopen-keychain-c3b49a318f82238245f6c40b7a8abda01cb9433d.tar.gz
open-keychain-c3b49a318f82238245f6c40b7a8abda01cb9433d.tar.bz2
open-keychain-c3b49a318f82238245f6c40b7a8abda01cb9433d.zip
Show app name in registered apps
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/.SelectSecretKeyFragment.java.kate-swpbin0 -> 64 bytes
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java6
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/.SelectSecretKeyFragment.java.kate-swp b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/.SelectSecretKeyFragment.java.kate-swp
new file mode 100644
index 000000000..c72aa8947
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/.SelectSecretKeyFragment.java.kate-swp
Binary files differ
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
index 434db7a29..3f5ca536f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain.ui;
import org.sufficientlysecure.keychain.Id;
import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.remote_api.CryptoConsumersActivity;
+import org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockActivity;
@@ -81,7 +81,7 @@ public class MainActivity extends SherlockActivity {
menu.add(0, Id.menu.option.preferences, 0, R.string.menu_preferences)
.setIcon(R.drawable.ic_menu_settings)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
- menu.add(0, Id.menu.option.crypto_consumers, 0, R.string.menu_crypto_consumers)
+ menu.add(0, Id.menu.option.crypto_consumers, 0, R.string.menu_apiAppSettings)
.setIcon(R.drawable.ic_menu_settings)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_WITH_TEXT);
return true;
@@ -96,7 +96,7 @@ public class MainActivity extends SherlockActivity {
return true;
case Id.menu.option.crypto_consumers:
- startActivity(new Intent(this, CryptoConsumersActivity.class));
+ startActivity(new Intent(this, RegisteredAppsListActivity.class));
return true;
default: