added an option to delete files after encryption or decryption, also no longer delete the output file if either fails

1 files changed, 14 insertions, 0 deletions

diff --git a/src/org/thialfihar/android/apg/DecryptFileActivity.java b/src/org/thialfihar/android/apg/DecryptFileActivity.java
index e8c8397eb..a8a33d1e2 100644
--- a/src/org/thialfihar/android/apg/DecryptFileActivity.java
+++ b/src/org/thialfihar/android/apg/DecryptFileActivity.java
@@ -40,6 +40,7 @@ import android.os.Message;
 import android.view.View;

 import android.view.View.OnClickListener;

 import android.widget.Button;

+import android.widget.CheckBox;

 import android.widget.EditText;

 import android.widget.ImageButton;

 import android.widget.ImageView;

@@ -49,6 +50,7 @@ import android.widget.Toast;
 

 public class DecryptFileActivity extends BaseActivity {

     private EditText mFilename = null;

+    private CheckBox mDeleteAfter = null;

     private ImageButton mBrowse = null;

     private Button mDecryptButton = null;

     private LinearLayout mSignatureLayout = null;

@@ -75,6 +77,8 @@ public class DecryptFileActivity extends BaseActivity {
             }

         });

 

+        mDeleteAfter = (CheckBox) findViewById(R.id.delete_after_decryption);

+

         mDecryptButton = (Button) findViewById(R.id.btn_decrypt);

         mDecryptButton.setOnClickListener(new OnClickListener() {

             @Override

@@ -127,6 +131,12 @@ public class DecryptFileActivity extends BaseActivity {
             return;

         }

 

+        File file = new File(mInputFilename);

+        if (!file.exists() || !file.isFile()) {

+            Toast.makeText(this, "Error: file not found", Toast.LENGTH_SHORT).show();

+            return;

+        }

+

         try {

             InputStream in = new FileInputStream(mInputFilename);

             try {

@@ -303,6 +313,10 @@ public class DecryptFileActivity extends BaseActivity {
             Toast.makeText(DecryptFileActivity.this,

                            "Successfully decrypted.",

                            Toast.LENGTH_SHORT).show();

+            if (mDeleteAfter.isChecked()) {

+                setDeleteFile(mInputFilename);

+                showDialog(Id.dialog.delete_file);

+            }

         }

 

         mSignatureLayout.setVisibility(View.INVISIBLE);