aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorknuthy <knuthy@gmail.com>2014-08-10 22:11:27 +0100
committerknuthy <knuthy@gmail.com>2014-08-10 22:11:27 +0100
commitffadf9e8b6746c0bf00160e79ac59f4e0416f4f0 (patch)
tree1b66b002605ac021769aacb5d1978c83eb25517f /app/src/main/java
parent77a4027ce5fdb519c3525ec325673a0bc3d18c8b (diff)
corrected a bug where the activity finishes before the dialog is dismissed
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 9655180e..35404c76 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -465,14 +465,13 @@ public class PgpHandler extends Activity {
public void onClick(DialogInterface dialogInterface, int i) {
(new File(getIntent().getExtras().getString("FILE_PATH"))).delete();
+ setResult(RESULT_CANCELED);
Git git = new Git(PasswordRepository.getRepository(new File("")));
- GitAsyncTask tasks = new GitAsyncTask(activity, false);
+ GitAsyncTask tasks = new GitAsyncTask(activity, true);
tasks.execute(
git.rm().addFilepattern(getIntent().getExtras().getString("FILE_PATH").replace(PasswordRepository.getWorkTree() + "/", "")),
git.commit().setMessage("[ANDROID PwdStore] Remove " + getIntent().getExtras().getString("FILE_PATH") + " from store.")
);
- setResult(RESULT_CANCELED);
- finish();
}
})
.setNegativeButton("NO", new DialogInterface.OnClickListener() {