moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity

fixing layout when creating default rsa keys

Browse Source
This commit is contained in:
Dominik 2012-04-25 18:37:58 +02:00
parent 73a2957d95
commit 26a9a9e423
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
View File

@ -84,6 +84,9 @@ public class EditKeyActivity extends SherlockFragmentActivity { // extends BaseA
Vector<PGPSecretKey> mKeys; Vector<PGPSecretKey> mKeys;
Vector<Integer> mKeysUsages; Vector<Integer> mKeysUsages;
// will be set to true to build layout later in handler
private boolean mBuildLayout = true;
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
menu.add(1, Id.menu.option.cancel, 0, R.string.btn_doNotSave).setShowAsAction( 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); .getBoolean(Apg.EXTRA_GENERATE_DEFAULT_KEYS);
if (generateDefaultKeys) { 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 // Send all information needed to service generate keys in other thread
Intent intent = new Intent(this, ApgService.class); Intent intent = new Intent(this, ApgService.class);
intent.putExtra(ApgService.EXTRA_ACTION, intent.putExtra(ApgService.EXTRA_ACTION,
@ -298,8 +304,10 @@ public class EditKeyActivity extends SherlockFragmentActivity { // extends BaseA
} }
}); });
if (mBuildLayout) {
buildLayout(); buildLayout();
} }
}
/** /**
* Build layout based on mUserId, mKeys and mKeysUsages Vectors. It creates Views for every user * Build layout based on mUserId, mKeys and mKeysUsages Vectors. It creates Views for every user