aboutsummaryrefslogtreecommitdiffstats
path: root/org_apg
diff options
context:
space:
mode:
authorDominik <dominik@dominikschuermann.de>2012-04-25 18:37:58 +0200
committerDominik <dominik@dominikschuermann.de>2012-06-13 19:28:23 +0300
commit26a9a9e42370f91cb179085a5ed567842f752753 (patch)
treedb96642a8ec1ed2eee293100cedf78b11bfd71a5 /org_apg
parent73a2957d95f2441f652949e9da27f1334dec67a0 (diff)
downloadopen-keychain-26a9a9e42370f91cb179085a5ed567842f752753.tar.gz
open-keychain-26a9a9e42370f91cb179085a5ed567842f752753.tar.bz2
open-keychain-26a9a9e42370f91cb179085a5ed567842f752753.zip
fixing layout when creating default rsa keys
Diffstat (limited to 'org_apg')
-rw-r--r--org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
index 822eb28d2..25a96c31e 100644
--- a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
+++ b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
@@ -84,6 +84,9 @@ public class EditKeyActivity extends SherlockFragmentActivity { // extends BaseA
Vector<PGPSecretKey> mKeys;
Vector<Integer> mKeysUsages;
+ // will be set to true to build layout later in handler
+ private boolean mBuildLayout = true;
+
@Override
public boolean onCreateOptionsMenu(Menu menu) {
menu.add(1, Id.menu.option.cancel, 0, R.string.btn_doNotSave).setShowAsAction(
@@ -175,6 +178,9 @@ public class EditKeyActivity extends SherlockFragmentActivity { // extends BaseA
.getBoolean(Apg.EXTRA_GENERATE_DEFAULT_KEYS);
if (generateDefaultKeys) {
+ // build layout in handler after generating keys not directly in onCreate
+ mBuildLayout = false;
+
// Send all information needed to service generate keys in other thread
Intent intent = new Intent(this, ApgService.class);
intent.putExtra(ApgService.EXTRA_ACTION,
@@ -298,7 +304,9 @@ public class EditKeyActivity extends SherlockFragmentActivity { // extends BaseA
}
});
- buildLayout();
+ if (mBuildLayout) {
+ buildLayout();
+ }
}
/**