mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-31 22:35:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix GitAsyncTask activity handling in error case (#818)

Browse Source
This commit is contained in:
Fabian Henneke
2020-05-30 21:55:14 +02:00
committed by GitHub
parent cd0b23e003
commit 81c4960dd6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt
View File

@@ -131,6 +131,10 @@ class GitAsyncTask(
is Result.Err -> { is Result.Err -> {
e(result.err) e(result.err)
operation.onError(rootCauseException(result.err)) operation.onError(rootCauseException(result.err))
if (finishWithResultOnEnd != null) {
activity?.setResult(Activity.RESULT_CANCELED)
activity?.finish()
}
} }
is Result.Ok -> { is Result.Ok -> {
operation.onSuccess() operation.onSuccess()
@@ -138,11 +142,11 @@ class GitAsyncTask(
activity?.setResult(Activity.RESULT_OK, finishWithResultOnEnd) activity?.setResult(Activity.RESULT_OK, finishWithResultOnEnd)
activity?.finish() activity?.finish()
} }
if (refreshListOnEnd) {
(activity as? PasswordStore)?.resetPasswordList()
}
} }
} }
if (refreshListOnEnd) {
(activity as? PasswordStore)?.resetPasswordList()
}
} }
} }