kumi/Android-Password-Store
1
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
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) { if (refreshListOnEnd) {
(activity as? PasswordStore)?.resetPasswordList() (activity as? PasswordStore)?.resetPasswordList()
} }
} }
}
}
} }