key edit fixes

1 files changed, 98 insertions, 59 deletions

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index 4dcaa6d73..c0c81b969 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -34,6 +34,7 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment;
 import org.sufficientlysecure.keychain.ui.widget.KeyEditor;
@@ -45,6 +46,7 @@ import org.sufficientlysecure.keychain.util.Log;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -60,9 +62,10 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 
-public class EditKeyActivity extends SherlockFragmentActivity {
+public class EditKeyActivity extends KeyActivity {
 
     // Actions for internal use only:
     public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEY";
@@ -72,13 +75,14 @@ public class EditKeyActivity extends SherlockFragmentActivity {
     public static final String EXTRA_USER_IDS = "user_ids";
     public static final String EXTRA_NO_PASSPHRASE = "no_passphrase";
     public static final String EXTRA_GENERATE_DEFAULT_KEYS = "generate_default_keys";
-    public static final String EXTRA_MASTER_KEY_ID = "master_key_id";
-    public static final String EXTRA_MASTER_CAN_SIGN = "master_can_sign";
 
     // results when saving key
     public static final String RESULT_EXTRA_MASTER_KEY_ID = "master_key_id";
     public static final String RESULT_EXTRA_USER_ID = "user_id";
 
+    // EDIT
+    private Uri mDataUri;
+
     private PGPSecretKeyRing mKeyRing = null;
 
     private SectionView mUserIdsView;
@@ -96,29 +100,10 @@ public class EditKeyActivity extends SherlockFragmentActivity {
     Vector<Integer> mKeysUsages;
     boolean masterCanSign = true;
 
-    // will be set to false to build layout later in handler
-    private boolean mBuildLayout = true;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // Inflate a "Done"/"Cancel" custom action bar
-        ActionBarHelper.setDoneCancelView(getSupportActionBar(), R.string.btn_save,
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        // save
-                        saveClicked();
-                    }
-                }, R.string.btn_do_not_save, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        // cancel
-                        cancelClicked();
-                    }
-                });
-
         mUserIds = new Vector<String>();
         mKeys = new Vector<PGPSecretKey>();
         mKeysUsages = new Vector<Integer>();
@@ -131,10 +116,6 @@ public class EditKeyActivity extends SherlockFragmentActivity {
         } else if (ACTION_EDIT_KEY.equals(action)) {
             handleActionEditKey(intent);
         }
-
-        if (mBuildLayout) {
-            buildLayout();
-        }
     }
 
     /**
@@ -143,6 +124,20 @@ public class EditKeyActivity extends SherlockFragmentActivity {
      * @param intent
      */
     private void handleActionCreateKey(Intent intent) {
+        // Inflate a "Done"/"Cancel" custom action bar
+        ActionBarHelper.setDoneCancelView(getSupportActionBar(), R.string.btn_save,
+                new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        saveClicked();
+                    }
+                }, R.string.btn_do_not_save, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        cancelClicked();
+                    }
+                });
+
         Bundle extras = intent.getExtras();
 
         mCurrentPassPhrase = "";
@@ -169,9 +164,6 @@ public class EditKeyActivity extends SherlockFragmentActivity {
                 boolean generateDefaultKeys = extras.getBoolean(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 serviceIntent = new Intent(this, KeychainIntentService.class);
                     serviceIntent.setAction(KeychainIntentService.ACTION_GENERATE_DEFAULT_RSA_KEYS);
@@ -228,12 +220,55 @@ public class EditKeyActivity extends SherlockFragmentActivity {
                     startService(serviceIntent);
                 }
             }
+        } else {
+            buildLayout();
+        }
+    }
+
+    /**
+     * Handle intent action to edit existing key
+     * 
+     * @param intent
+     */
+    private void handleActionEditKey(Intent intent) {
+        // Inflate a "Done"/"Cancel" custom action bar
+        ActionBarHelper.setDoneView(getSupportActionBar(), R.string.btn_save,
+                new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        saveClicked();
+                    }
+                });
+
+        mDataUri = intent.getData();
+        if (mDataUri == null) {
+            Log.e(Constants.TAG, "Intent data missing. Should be Uri of key!");
+            finish();
+            return;
+        } else {
+            Log.d(Constants.TAG, "uri: " + mDataUri);
+
+            long keyRingRowId = Long.valueOf(mDataUri.getLastPathSegment());
+
+            // get master key id using row id
+            long masterKeyId = ProviderHelper.getSecretMasterKeyId(this, keyRingRowId);
+
+            boolean masterCanSign = ProviderHelper.getSecretMasterKeyCanSign(this, keyRingRowId);
+
+            String passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId);
+            if (passphrase == null) {
+                showPassphraseDialog(masterKeyId, masterCanSign);
+            } else {
+                // PgpMain.setEditPassPhrase(passPhrase);
+                mCurrentPassPhrase = passphrase;
+
+                finallyEdit(masterKeyId, masterCanSign);
+            }
         }
     }
 
     private void showPassphraseDialog(final long masterKeyId, final boolean masterCanSign) {
         // Message is received after passphrase is cached
-        final boolean mCanSign = masterCanSign;
         Handler returnHandler = new Handler() {
             @Override
             public void handleMessage(Message message) {
@@ -263,37 +298,41 @@ public class EditKeyActivity extends SherlockFragmentActivity {
         }
     }
 
-    /**
-     * Handle intent action to edit existing key
-     * 
-     * @param intent
-     */
-    private void handleActionEditKey(Intent intent) {
-        Bundle extras = intent.getExtras();
-
-        if (extras != null) {
-            if (extras.containsKey(EXTRA_MASTER_CAN_SIGN)) {
-                masterCanSign = extras.getBoolean(EXTRA_MASTER_CAN_SIGN);
-            }
-            if (extras.containsKey(EXTRA_MASTER_KEY_ID)) {
-                long masterKeyId = extras.getLong(EXTRA_MASTER_KEY_ID);
-
-                // build layout in edit()
-                mBuildLayout = false;
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        // show menu only on edit
+        if (mDataUri != null) {
+            return super.onPrepareOptionsMenu(menu);
+        } else {
+            return false;
+        }
+    }
 
-                String passPhrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId);
-                if (passPhrase == null) {
-                    showPassphraseDialog(masterKeyId, masterCanSign);
-                } else {
-                    // PgpMain.setEditPassPhrase(passPhrase);
-                    mCurrentPassPhrase = passPhrase;
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getSupportMenuInflater().inflate(R.menu.key_edit, menu);
+        return true;
+    }
 
-                    finallyEdit(masterKeyId, masterCanSign);
-                }
-            }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.menu_key_edit_cancel:
+            cancelClicked();
+            return true;
+        case R.id.menu_key_edit_export_file:
+            showExportKeysDialog(mDataUri, Id.type.secret_key, Constants.path.APP_DIR
+                    + "/secexport.asc");
+            return true;
+        case R.id.menu_key_edit_delete:
+            deleteKey(mDataUri, Id.type.secret_key);
+            return true;
         }
+        return super.onOptionsItemSelected(item);
     }
 
+    @SuppressWarnings("unchecked")
     private void finallyEdit(final long masterKeyId, final boolean masterCanSign) {
         if (masterKeyId != 0) {
             PGPSecretKey masterKey = null;
@@ -316,13 +355,13 @@ public class EditKeyActivity extends SherlockFragmentActivity {
             }
         }
 
-        buildLayout();
-
         // TODO: ???
         if (mCurrentPassPhrase == null) {
             mCurrentPassPhrase = "";
         }
 
+        buildLayout();
+
         if (mCurrentPassPhrase.equals("")) {
             // check "no passphrase" checkbox and remove button
             mNoPassphrase.setChecked(true);