summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorzeapo <mohamed@zenadi.com>2014-08-17 21:47:48 +0200
committerzeapo <mohamed@zenadi.com>2014-08-17 21:47:48 +0200
commit196813022a694b0b2a3b75c9e785bfd04bbd0ca6 (patch)
treef426ff622459200c8b8f072922a1b2e5d36762ab /app/src/main
parent68623dcf8d0fabd121cf7c34ecb4dafe9478cceb (diff)
corrected a bug where cancel in openkeychain does not dismiss pgp dialog
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java4
1 files changed, 4 insertions, 0 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 26d49db9..cbbc0c11 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -247,6 +247,10 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB
break;
}
}
+ } else if (resultCode == RESULT_CANCELED) {
+ bindingDialog.dismiss();
+ setResult(RESULT_CANCELED, data);
+ finish();
}
}