diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-08-14 01:46:47 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 22:16:47 +0200 |
| commit | 57f1c65fdfbac9acd5e4fce30a6d5ef131fa9728 (patch) | |
| tree | 7add98aecbb8d6b14f104a08893a1a319b1ab216 /app/src/main/java/com/zeapo/pwdstore/crypto | |
| parent | 2732f9093e5d609db15426f157d580c9494b9f15 (diff) | |
| download | HardenedPass-57f1c65fdfbac9acd5e4fce30a6d5ef131fa9728.tar.gz HardenedPass-57f1c65fdfbac9acd5e4fce30a6d5ef131fa9728.zip | |
Restore workaround for preventing empty commits (#1019)
* Revert "Add symlink support to JGit (#1016)"
This reverts commit 5032696cec9da86c2ad97b9931e8d85feb18da0c.
* Restore workaround for empty commits and document commands
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Update app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/crypto')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt | 36 |
1 files changed, 13 insertions, 23 deletions
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 e42bfef3..1376dd04 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt @@ -44,7 +44,6 @@ import kotlinx.coroutines.launch import me.msfjarvis.openpgpktx.util.OpenPgpApi import me.msfjarvis.openpgpktx.util.OpenPgpServiceConnection import me.msfjarvis.openpgpktx.util.OpenPgpUtils -import org.eclipse.jgit.api.Git class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound { @@ -328,16 +327,13 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB if (result.resultCode == RESULT_OK) { result.data?.getStringArrayExtra(OpenPgpApi.EXTRA_KEY_IDS)?.let { keyIds -> gpgIdentifierFile.writeText(keyIds.joinToString("\n")) - val repo = PasswordRepository.getRepository(null) - if (repo != null) { - lifecycleScope.launch { - commitChange( - getString( - R.string.git_commit_gpg_id, - getLongName(gpgIdentifierFile.parentFile!!.absolutePath, repoPath, gpgIdentifierFile.name) - ) + lifecycleScope.launch { + commitChange( + getString( + R.string.git_commit_gpg_id, + getLongName(gpgIdentifierFile.parentFile!!.absolutePath, repoPath, gpgIdentifierFile.name) ) - } + ) } encrypt(data) } @@ -430,19 +426,13 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB returnIntent.putExtra(RETURN_EXTRA_USERNAME, username) } - val repo = PasswordRepository.getRepository(null) - if (repo != null) { - val status = Git(repo).status().call() - if (status.modified.isNotEmpty()) { - lifecycleScope.launch { - commitChange( - getString( - R.string.git_commit_edit_text, - getLongName(fullPath, repoPath, editName) - ) - ) - } - } + lifecycleScope.launch { + commitChange( + getString( + R.string.git_commit_edit_text, + getLongName(fullPath, repoPath, editName) + ) + ) } if (directoryInputLayout.isVisible && directoryInputLayout.isEnabled && oldFileName != null) { |