From 2c8999c1bff1c82b047e7111d47c539fc6207336 Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Sun, 23 Aug 2020 18:51:36 +0200 Subject: [PATCH] Prevent racing double commits on password creation (#1047) Co-authored-by: Harsh Shandilya --- CHANGELOG.md | 1 + .../pwdstore/crypto/PasswordCreationActivity.kt | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c561a1..dbf2adc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. ### Fixed - Password creation UI will scroll if it does not fit on the screen +- Saving a password after creating it fails to finish commit operation ## [1.11.1] - 2020-08-21 diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt index c5d3d70a..ff5a8179 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt @@ -440,13 +440,15 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB returnIntent.putExtra(RETURN_EXTRA_USERNAME, username) } - lifecycleScope.launch { - commitChange( - getString( - R.string.git_commit_edit_text, - getLongName(fullPath, repoPath, editName) + if (editing) { + lifecycleScope.launch { + commitChange( + getString( + R.string.git_commit_edit_text, + getLongName(fullPath, repoPath, editName) + ) ) - ) + } } if (directoryInputLayout.isVisible && directoryInputLayout.isEnabled && oldFileName != null) {