From f9dea313004b51c5220a2d0b5e9407aab0604df5 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 23 Jun 2015 17:07:59 +0200
Subject: implement deletion of files

---
 .../keychain/operations/results/CertifyResult.java  |  2 +-
 .../keychain/operations/results/DeleteResult.java   |  2 +-
 .../operations/results/ImportKeyResult.java         |  2 +-
 .../operations/results/OperationResult.java         |  2 +-
 .../keychain/ui/DecryptListFragment.java            | 21 +++++++++++++++++----
 5 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/CertifyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/CertifyResult.java
index 0a0e63330..a9f8170d9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/CertifyResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/CertifyResult.java
@@ -132,7 +132,7 @@ public class CertifyResult extends InputPendingResult {
                 intent.putExtra(LogDisplayFragment.EXTRA_RESULT, CertifyResult.this);
                 activity.startActivity(intent);
             }
-        }, R.string.view_log);
+        }, R.string.snackbar_details);
 
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java
index 50f49add2..52ff8bf44 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java
@@ -124,7 +124,7 @@ public class DeleteResult extends OperationResult {
                 intent.putExtra(LogDisplayFragment.EXTRA_RESULT, DeleteResult.this);
                 activity.startActivity(intent);
             }
-        }, R.string.view_log);
+        }, R.string.snackbar_details);
 
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java
index 1438ad698..2a032cef2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java
@@ -190,7 +190,7 @@ public class ImportKeyResult extends OperationResult {
                 intent.putExtra(LogDisplayFragment.EXTRA_RESULT, ImportKeyResult.this);
                 activity.startActivity(intent);
             }
-        }, R.string.view_log);
+        }, R.string.snackbar_details);
 
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
index f110b9186..c9e427462 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
@@ -253,7 +253,7 @@ public abstract class OperationResult implements Parcelable {
                     intent.putExtra(LogDisplayFragment.EXTRA_RESULT, OperationResult.this);
                     activity.startActivity(intent);
                 }
-            }, R.string.view_log);
+            }, R.string.snackbar_details);
 
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
index 0d527926d..549922526 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
@@ -491,12 +491,28 @@ public class DecryptListFragment
                 askForOutputFilename(model.mInputUri, metadata.getFilename(), metadata.getMimeType());
                 return true;
             case R.id.decrypt_delete:
-                Notify.create(activity, "decrypt/delete not yet implemented", Style.ERROR).show(this);
+                deleteFile(activity, model.mInputUri);
                 return true;
         }
         return false;
     }
 
+    private void deleteFile(Activity activity, Uri uri) {
+
+        try {
+            int deleted = activity.getContentResolver().delete(uri, null, null);
+            if (deleted > 0) {
+                Notify.create(activity, R.string.file_delete_ok, Style.OK).show();
+            } else {
+                Notify.create(activity, R.string.file_delete_none, Style.WARN).show();
+            }
+        } catch (Exception e) {
+            Log.e(Constants.TAG, "exception deleting file", e);
+            Notify.create(activity, R.string.file_delete_exception, Style.ERROR).show();
+        }
+
+    }
+
     public static class DecryptFilesAdapter extends RecyclerView.Adapter<ViewHolder> {
         private Context mContext;
         private ArrayList<ViewModel> mDataset;
@@ -664,9 +680,6 @@ public class DecryptListFragment
                     mMenuClickedModel = model;
                     PopupMenu menu = new PopupMenu(mContext, view);
                     menu.inflate(R.menu.decrypt_item_context_menu);
-                    if (!"file".equals(model.mInputUri.getScheme())) {
-                        menu.getMenu().findItem(R.id.decrypt_delete).setVisible(false);
-                    }
                     menu.setOnMenuItemClickListener(mMenuItemClickListener);
                     menu.setOnDismissListener(new OnDismissListener() {
                         @Override
-- 
cgit v1.2.3