aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
diff options
context:
space:
mode:
authorMatthew Wong <wongma7@outlook.com>2015-09-16 11:26:51 -0400
committerMatthew Wong <wongma7@outlook.com>2015-09-16 11:26:51 -0400
commit8ed4449e4b67c6832f50c1a29e59f146eaeb6f92 (patch)
tree70fe9ddcb709f3d65144537e96913119ea1694c2 /app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
parent394a549f7e8aa5b656ba847a03938a34fccc54dd (diff)
downloadHardenedPass-8ed4449e4b67c6832f50c1a29e59f146eaeb6f92.tar.gz
HardenedPass-8ed4449e4b67c6832f50c1a29e59f146eaeb6f92.zip
Use intent for ensuring commit after decrypt->edit button->save
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java5
1 files changed, 5 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 131e8e51..6c8a1a61 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -176,6 +176,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
Intent intent = new Intent(this, PgpHandler.class);
intent.putExtra("FILE_PATH", directoryPath);
intent.putExtra("Operation", "ENCRYPT");
+ intent.putExtra("fromDecrypt", true);
setIntent(intent);
}
@@ -427,6 +428,10 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
Intent data = new Intent();
data.putExtra("CREATED_FILE", path);
data.putExtra("NAME", ((EditText) findViewById(R.id.crypto_password_file_edit)).getText().toString());
+ // if coming from decrypt screen->edit button
+ if (getIntent().getBooleanExtra("fromDecrypt", false)) {
+ data.putExtra("needCommit", true);
+ }
setResult(RESULT_OK, data);
finish();
} catch (Exception e) {