Merge branch 'development' of github.com:open-keychain/open-keychain into development

3 files changed, 81 insertions, 60 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 13a5ac269..5834fa502 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -74,6 +74,8 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler.MessageStatus;
+import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
@@ -310,31 +312,31 @@ public class ViewKeyActivity extends BaseActivity implements
                 return true;
             }
             case R.id.menu_key_view_export_file: {
-                Intent mIntent = new Intent(this,PassphraseDialogActivity.class);
-                long keyId=0;
                 try {
-                    keyId = new ProviderHelper(this)
-                            .getCachedPublicKeyRing(mDataUri)
-                            .extractOrGetMasterKeyId();
-                } catch (PgpKeyNotFoundException e) {
-                    e.printStackTrace();
+                    if (PassphraseCacheService.getCachedPassphrase(this, mMasterKeyId, mMasterKeyId) != null) {
+                        exportToFile(mDataUri, mExportHelper, mProviderHelper);
+                        return true;
+                    }
+
+                    startPassphraseActivity(REQUEST_EXPORT);
+                } catch (PassphraseCacheService.KeyNotFoundException e) {
+                    // This happens when the master key is stripped
+                    exportToFile(mDataUri, mExportHelper, mProviderHelper);
                 }
-                mIntent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID,keyId);
-                startActivityForResult(mIntent,REQUEST_EXPORT);
                 return true;
             }
             case R.id.menu_key_view_delete: {
-                Intent mIntent = new Intent(this,PassphraseDialogActivity.class);
-                long keyId=0;
                 try {
-                    keyId = new ProviderHelper(this)
-                            .getCachedPublicKeyRing(mDataUri)
-                            .extractOrGetMasterKeyId();
-                } catch (PgpKeyNotFoundException e) {
-                    e.printStackTrace();
+                    if (PassphraseCacheService.getCachedPassphrase(this, mMasterKeyId, mMasterKeyId) != null) {
+                        deleteKey();
+                        return true;
+                    }
+
+                    startPassphraseActivity(REQUEST_DELETE);
+                } catch (PassphraseCacheService.KeyNotFoundException e) {
+                    // This happens when the master key is stripped
+                    deleteKey();
                 }
-                mIntent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID,keyId);
-                startActivityForResult(mIntent,REQUEST_DELETE);
                 return true;
             }
             case R.id.menu_key_view_advanced: {
@@ -473,22 +475,32 @@ public class ViewKeyActivity extends BaseActivity implements
         ActivityCompat.startActivity(this, qrCodeIntent, opts);
     }
 
-    private void exportToFile(Uri dataUri, ExportHelper exportHelper, ProviderHelper providerHelper)
-            throws ProviderHelper.NotFoundException {
-        Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingUri(dataUri);
-
-        HashMap<String, Object> data = providerHelper.getGenericData(
-                baseUri,
-                new String[]{KeychainContract.Keys.MASTER_KEY_ID, KeychainContract.KeyRings.HAS_SECRET},
-                new int[]{ProviderHelper.FIELD_TYPE_INTEGER, ProviderHelper.FIELD_TYPE_INTEGER});
+    private void startPassphraseActivity(int requestCode) {
+        Intent intent = new Intent(this, PassphraseDialogActivity.class);
+        intent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID, mMasterKeyId);
+        startActivityForResult(intent, requestCode);
+    }
 
-        exportHelper.showExportKeysDialog(
-                new long[]{(Long) data.get(KeychainContract.KeyRings.MASTER_KEY_ID)},
-                Constants.Path.APP_DIR_FILE, ((Long) data.get(KeychainContract.KeyRings.HAS_SECRET) != 0)
-        );
+    private void exportToFile(Uri dataUri, ExportHelper exportHelper, ProviderHelper providerHelper) {
+        try {
+            Uri baseUri = KeychainContract.KeyRings.buildUnifiedKeyRingUri(dataUri);
+
+            HashMap<String, Object> data = providerHelper.getGenericData(
+                    baseUri,
+                    new String[]{KeychainContract.Keys.MASTER_KEY_ID, KeychainContract.KeyRings.HAS_SECRET},
+                    new int[]{ProviderHelper.FIELD_TYPE_INTEGER, ProviderHelper.FIELD_TYPE_INTEGER});
+
+            exportHelper.showExportKeysDialog(
+                    new long[]{(Long) data.get(KeychainContract.KeyRings.MASTER_KEY_ID)},
+                    Constants.Path.APP_DIR_FILE, ((Long) data.get(KeychainContract.KeyRings.HAS_SECRET) != 0)
+            );
+        } catch (ProviderHelper.NotFoundException e) {
+            Notify.showNotify(this, R.string.error_key_not_found, Notify.Style.ERROR);
+            Log.e(Constants.TAG, "Key not found", e);
+        }
     }
 
-    private void deleteKey(Uri dataUri, ExportHelper exportHelper) {
+    private void deleteKey() {
         // Message is received after key is deleted
         Handler returnHandler = new Handler() {
             @Override
@@ -500,7 +512,11 @@ public class ViewKeyActivity extends BaseActivity implements
             }
         };
 
-        exportHelper.deleteKey(dataUri, returnHandler);
+        // Create a new Messenger for the communication back
+        Messenger messenger = new Messenger(returnHandler);
+        DeleteKeyDialogFragment deleteKeyDialog = DeleteKeyDialogFragment.newInstance(messenger,
+                new long[]{ mMasterKeyId });
+        deleteKeyDialog.show(getSupportFragmentManager(), "deleteKeyDialog");
     }
 
     @Override
@@ -531,18 +547,13 @@ public class ViewKeyActivity extends BaseActivity implements
         }
 
         if (requestCode == REQUEST_DELETE && resultCode == Activity.RESULT_OK){
-            deleteKey(mDataUri, mExportHelper);
+            deleteKey();
         }
+
         if (requestCode == REQUEST_EXPORT && resultCode == Activity.RESULT_OK){
-            try {
-                exportToFile(mDataUri, mExportHelper, mProviderHelper);
-            } catch (ProviderHelper.NotFoundException e) {
-                Notify.showNotify(this, R.string.error_key_not_found, Notify.Style.ERROR);
-                Log.e(Constants.TAG, "Key not found", e);
-            }
+            exportToFile(mDataUri, mExportHelper, mProviderHelper);
         }
 
-
         if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
             OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
             result.createNotify(this).show();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
index 3bc29edb6..9736b5765 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
@@ -19,6 +19,11 @@ package org.sufficientlysecure.keychain.ui.util;
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.nispok.snackbar.Snackbar;
 import com.nispok.snackbar.Snackbar.SnackbarDuration;
@@ -61,11 +66,11 @@ public class Notify {
                 break;
         }
 
-        SnackbarManager.show(bar);
+        showSnackbar(activity, bar);
 
     }
 
-    public static Showable createNotify (Activity activity, int resId, int duration, Style style) {
+    public static Showable createNotify (final Activity activity, int resId, int duration, Style style) {
         final Snackbar bar = getSnackbar(activity)
                 .text(resId);
 
@@ -90,7 +95,7 @@ public class Notify {
         return new Showable () {
             @Override
             public void show() {
-                SnackbarManager.show(bar);
+                showSnackbar(activity, bar);
             }
         };
     }
@@ -104,7 +109,7 @@ public class Notify {
         return createNotify(activity, msg, duration, style, null, 0);
     }
 
-    public static Showable createNotify(Activity activity, String msg, int duration, Style style,
+    public static Showable createNotify(final Activity activity, String msg, int duration, Style style,
                                         final ActionListener listener, int resIdAction) {
 
         final Snackbar bar = getSnackbar(activity)
@@ -141,7 +146,7 @@ public class Notify {
         return new Showable () {
             @Override
             public void show() {
-                SnackbarManager.show(bar);
+                showSnackbar(activity, bar);
             }
         };
 
@@ -178,6 +183,26 @@ public class Notify {
         return bar;
     }
 
+    private static void showSnackbar(Activity activity, Snackbar snackbar) {
+        if (activity instanceof FragmentActivity) {
+            FragmentManager fragmentManager = ((FragmentActivity) activity).getSupportFragmentManager();
+
+            int count = fragmentManager.getBackStackEntryCount();
+            Fragment fragment = fragmentManager.getFragments().get(count > 0 ? count - 1 : 0);
+
+            if (fragment != null) {
+                View view = fragment.getView();
+
+                if (view != null) {
+                    SnackbarManager.show(snackbar, (ViewGroup) view);
+                    return;
+                }
+            }
+        }
+
+        SnackbarManager.show(snackbar);
+    }
+
     public interface Showable {
         public void show();
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
index cda5892fe..7b164f2b2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
@@ -47,21 +47,6 @@ public class ExportHelper {
         this.mActivity = activity;
     }
 
-    public void deleteKey(Uri dataUri, Handler deleteHandler) {
-        try {
-            long masterKeyId = new ProviderHelper(mActivity).getCachedPublicKeyRing(dataUri)
-                .extractOrGetMasterKeyId();
-
-            // Create a new Messenger for the communication back
-            Messenger messenger = new Messenger(deleteHandler);
-            DeleteKeyDialogFragment deleteKeyDialog = DeleteKeyDialogFragment.newInstance(messenger,
-                    new long[]{ masterKeyId });
-            deleteKeyDialog.show(mActivity.getSupportFragmentManager(), "deleteKeyDialog");
-        } catch (PgpKeyNotFoundException e) {
-            Log.e(Constants.TAG, "key not found!", e);
-        }
-    }
-
     /**
      * Show dialog where to export keys
      */