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

Address GitOperationActivity regressions (#824)

Browse source
This commit is contained in:
Fabian Henneke 2020-06-02 11:33:38 +02:00 committed by GitHub
parent fe2595a4cd
commit 43ae4bbdb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt
View file

@ -20,6 +20,7 @@ import org.eclipse.jgit.api.PushCommand
import org.eclipse.jgit.api.RebaseResult import org.eclipse.jgit.api.RebaseResult
import org.eclipse.jgit.api.StatusCommand import org.eclipse.jgit.api.StatusCommand
import org.eclipse.jgit.transport.RemoteRefUpdate import org.eclipse.jgit.transport.RemoteRefUpdate
import org.eclipse.jgit.transport.SshSessionFactory
import java.io.IOException import java.io.IOException
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
@ -133,7 +134,6 @@ class GitAsyncTask(
operation.onError(rootCauseException(result.err)) operation.onError(rootCauseException(result.err))
if (finishWithResultOnEnd != null) { if (finishWithResultOnEnd != null) {
activity?.setResult(Activity.RESULT_CANCELED) activity?.setResult(Activity.RESULT_CANCELED)
activity?.finish()
} }
} }
is Result.Ok -> { is Result.Ok -> {
@ -147,6 +147,7 @@ class GitAsyncTask(
if (refreshListOnEnd) { if (refreshListOnEnd) {
(activity as? PasswordStore)?.resetPasswordList() (activity as? PasswordStore)?.resetPasswordList()
} }
SshSessionFactory.setInstance(null)
} }
} }