diff options
| author | Matthew Wong <wongma7@outlook.com> | 2015-08-26 18:03:23 -0400 |
|---|---|---|
| committer | Matthew Wong <wongma7@outlook.com> | 2015-08-26 18:03:23 -0400 |
| commit | a59f5b4cc71e8e47ce96afbf09f97d1c8006cda3 (patch) | |
| tree | 514ecdd529e7aae0c1efc853638e777c5d97fe4e /app | |
| parent | f6d3dc23fbf68e8440fd9cab77797ad45b3100b1 (diff) | |
Fix #120 -- editing not creating git commits and yet another version bumpv1.2.0.31
Diffstat (limited to 'app')
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/PasswordStore.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/build.gradle b/app/build.gradle index 3bd323ba..9aa6e248 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.zeapo.pwdstore" minSdkVersion 15 targetSdkVersion 23 - versionCode 50 - versionName "1.2.0.30" + versionCode 51 + versionName "1.2.0.31" } compileOptions { diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index ce4b02ec..d6e18995 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -442,7 +442,10 @@ public class PasswordStore extends AppCompatActivity { // if we get here with a RESULT_OK then it's probably OK :) settings.edit().putBoolean("repository_initialized", true).apply(); break; - case PgpHandler.REQUEST_CODE_ENCRYPT : + case PgpHandler.REQUEST_CODE_ENCRYPT: + case PgpHandler.REQUEST_CODE_DECRYPT_AND_VERIFY: + // RESULT_OK and REQUEST_CODE_DECRYPT_AND_VERIFY only when a file has been edited + // since normally REQUEST_CODE_DECRYPT_AND_VERIFY returns RESULT_CANCELLED Git git = new Git(PasswordRepository.getRepository(new File(""))); GitAsyncTask tasks = new GitAsyncTask(this, false, false, CommitCommand.class); tasks.execute( |