aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorFabian Henneke <FabianHenneke@users.noreply.github.com>2020-06-02 11:33:38 +0200
committerGitHub <noreply@github.com>2020-06-02 15:03:38 +0530
commit43ae4bbdb7c189e614f5f7af0a2dc53e70a741bd (patch)
tree1c5c4bae39c8ca137607eef9cecbfd5986b6851f /app/src/main/java
parentfe2595a4cd14fc4ef9fc4eaed493e1b57fb19317 (diff)
Address GitOperationActivity regressions (#824)
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt
index 0b4caadf..1fd5f9e5 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt
@@ -20,6 +20,7 @@ import org.eclipse.jgit.api.PushCommand
import org.eclipse.jgit.api.RebaseResult
import org.eclipse.jgit.api.StatusCommand
import org.eclipse.jgit.transport.RemoteRefUpdate
+import org.eclipse.jgit.transport.SshSessionFactory
import java.io.IOException
import java.lang.ref.WeakReference
@@ -133,7 +134,6 @@ class GitAsyncTask(
operation.onError(rootCauseException(result.err))
if (finishWithResultOnEnd != null) {
activity?.setResult(Activity.RESULT_CANCELED)
- activity?.finish()
}
}
is Result.Ok -> {
@@ -147,6 +147,7 @@ class GitAsyncTask(
if (refreshListOnEnd) {
(activity as? PasswordStore)?.resetPasswordList()
}
+ SshSessionFactory.setInstance(null)
}
}