1 files changed, 18 insertions, 65 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index cae6cf043..5f29f1d18 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
@@ -18,43 +18,24 @@
 package org.sufficientlysecure.keychain.ui.dialog;
 
 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
-import android.os.Message;
-import android.os.Messenger;
 import android.provider.DocumentsContract;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 import android.widget.Toast;
 
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.service.KeychainIntentService;
-import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.helper.FileHelper;
 
 public class DeleteFileDialogFragment extends DialogFragment {
-    private static final String ARG_DELETE_FILE = "delete_file";
     private static final String ARG_DELETE_URI = "delete_uri";
 
     /**
      * Creates new instance of this delete file dialog fragment
      */
-    public static DeleteFileDialogFragment newInstance(String deleteFile) {
-        DeleteFileDialogFragment frag = new DeleteFileDialogFragment();
-        Bundle args = new Bundle();
-
-        args.putString(ARG_DELETE_FILE, deleteFile);
-
-        frag.setArguments(args);
-
-        return frag;
-    }
-
-    /**
-     * Creates new instance of this delete file dialog fragment
-     */
     public static DeleteFileDialogFragment newInstance(Uri deleteUri) {
         DeleteFileDialogFragment frag = new DeleteFileDialogFragment();
         Bundle args = new Bundle();
@@ -73,15 +54,15 @@ public class DeleteFileDialogFragment extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final FragmentActivity activity = getActivity();
 
-        final Uri deleteUri = getArguments().containsKey(ARG_DELETE_URI) ? getArguments().<Uri>getParcelable(ARG_DELETE_URI) : null;
-        final String deleteFile = getArguments().getString(ARG_DELETE_FILE);
+        final Uri deleteUri = getArguments().getParcelable(ARG_DELETE_URI);
+        final String deleteFilename = FileHelper.getFilename(getActivity(), deleteUri);
 
         CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(activity);
 
 
         alert.setIcon(R.drawable.ic_dialog_alert_holo_light);
         alert.setTitle(R.string.warning);
-        alert.setMessage(this.getString(R.string.file_delete_confirmation, deleteFile));
+        alert.setMessage(this.getString(R.string.file_delete_confirmation, deleteFilename));
 
         alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
 
@@ -89,51 +70,23 @@ public class DeleteFileDialogFragment extends DialogFragment {
             public void onClick(DialogInterface dialog, int id) {
                 dismiss();
 
-                if (deleteUri != null) {
-                    // We can not securely delete Documents, so just use usual delete on them
-                    DocumentsContract.deleteDocument(getActivity().getContentResolver(), deleteUri);
-                    return;
-                }
-
-                // Send all information needed to service to edit key in other thread
-                Intent intent = new Intent(activity, KeychainIntentService.class);
-
-                // fill values for this action
-                Bundle data = new Bundle();
-
-                intent.setAction(KeychainIntentService.ACTION_DELETE_FILE_SECURELY);
-                data.putString(KeychainIntentService.DELETE_FILE, deleteFile);
-                intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
-
-                ProgressDialogFragment deletingDialog = ProgressDialogFragment.newInstance(
-                        getString(R.string.progress_deleting_securely),
-                        ProgressDialog.STYLE_HORIZONTAL,
-                        false,
-                        null);
-
-                // Message is received after deleting is done in KeychainIntentService
-                KeychainIntentServiceHandler saveHandler =
-                        new KeychainIntentServiceHandler(activity, deletingDialog) {
-                    public void handleMessage(Message message) {
-                        // handle messages by standard KeychainIntentHandler first
-                        super.handleMessage(message);
-
-                        if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
-                            Toast.makeText(activity, R.string.file_delete_successful,
-                                    Toast.LENGTH_SHORT).show();
-                        }
+                // We can not securely delete Uris, so just use usual delete on them
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                    if (DocumentsContract.deleteDocument(getActivity().getContentResolver(), deleteUri)) {
+                        Toast.makeText(getActivity(), R.string.file_delete_successful, Toast.LENGTH_SHORT).show();
+                        return;
                     }
-                };
+                }
 
-                // Create a new Messenger for the communication back
-                Messenger messenger = new Messenger(saveHandler);
-                intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
+                if (getActivity().getContentResolver().delete(deleteUri, null, null) > 0) {
+                    Toast.makeText(getActivity(), R.string.file_delete_successful, Toast.LENGTH_SHORT).show();
+                    return;
+                }
 
-                // show progress dialog
-                deletingDialog.show(activity.getSupportFragmentManager(), "deletingDialog");
+                Toast.makeText(getActivity(), getActivity().getString(R.string.error_file_delete_failed, deleteFilename), Toast.LENGTH_SHORT).show();
 
-                // start service with intent
-                activity.startService(intent);
+                // Note: We can't delete every file...
+                // If possible we should find out if deletion is possible before even showing the option to do so.
             }
         });
         alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {