DeleteResult: add custom createNotify

2 files changed, 21 insertions, 11 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index b0872a71a..0a9af8673 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -61,6 +61,7 @@ import android.widget.TextView;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
+import org.sufficientlysecure.keychain.operations.results.DeleteResult;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
@@ -504,7 +505,14 @@ public class KeyListFragment extends LoaderFragment
         Handler returnHandler = new Handler() {
             @Override
             public void handleMessage(Message message) {
-                if (message.what == DeleteKeyDialogFragment.MESSAGE_OKAY) {
+                if (message.arg1 == DeleteKeyDialogFragment.MESSAGE_OKAY) {
+                    Bundle data = message.getData();
+                    if (data != null) {
+                        DeleteResult result = data.getParcelable(DeleteResult.EXTRA_RESULT);
+                        if (result != null) {
+                            result.createNotify(getActivity()).show();
+                        }
+                    }
                     mode.finish();
                 }
             }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index d0c9cea5b..5b96ea231 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
@@ -130,18 +130,20 @@ public class DeleteKeyDialogFragment extends DialogFragment {
 
                 // Message is received after importing is done in KeychainIntentService
                 KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
-                        getActivity(),
-                        getString(R.string.progress_deleting),
-                        ProgressDialog.STYLE_HORIZONTAL) {
+                        getActivity(), getString(R.string.progress_deleting),
+                        ProgressDialog.STYLE_HORIZONTAL, true) {
+                    @Override
                     public void handleMessage(Message message) {
-                        // handle messages by standard KeychainIntentServiceHandler first
                         super.handleMessage(message);
-                        try {
-                            Message msg = Message.obtain();
-                            msg.copyFrom(message);
-                            messenger.send(msg);
-                        } catch (RemoteException e) {
-                            Log.e(Constants.TAG, "messenger error", e);
+                        // handle messages by standard KeychainIntentServiceHandler first
+                        if (message.arg1 == MESSAGE_OKAY) {
+                            try {
+                                Message msg = Message.obtain();
+                                msg.copyFrom(message);
+                                messenger.send(msg);
+                            } catch (RemoteException e) {
+                                Log.e(Constants.TAG, "messenger error", e);
+                            }
                         }
                     }
                 };