aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/git/config
diff options
context:
space:
mode:
authorFabian Henneke <FabianHenneke@users.noreply.github.com>2020-09-11 09:58:03 +0200
committerGitHub <noreply@github.com>2020-09-11 13:28:03 +0530
commit7a58e397a9323476fcea5d1556b4996e474dc15e (patch)
tree797359ddeaf81094e3ad8eea8736bf672e39ad91 /app/src/main/java/com/zeapo/pwdstore/git/config
parent9cb8551a90c10b22ef1c81ffcf00a84e1d9144f9 (diff)
downloadHardenedPass-7a58e397a9323476fcea5d1556b4996e474dc15e.tar.gz
HardenedPass-7a58e397a9323476fcea5d1556b4996e474dc15e.zip
Disable SSH multiplexing if not supported (#1093)
Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/config')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt b/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt
index 1169345b..f4cbc04f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt
@@ -73,7 +73,9 @@ object GitSettings {
}
if (PasswordRepository.isInitialized)
PasswordRepository.addRemote("origin", value, true)
- // When the server changes, remote password and host key file should be deleted.
+ // When the server changes, remote password, multiplexing support and host key file
+ // should be deleted/reset.
+ useMultiplexing = true
encryptedSettings.edit { remove(PreferenceKeys.HTTPS_PASSWORD) }
File("${Application.instance.filesDir}/.host_key").delete()
}
@@ -98,6 +100,13 @@ object GitSettings {
putString(PreferenceKeys.GIT_BRANCH_NAME, value)
}
}
+ var useMultiplexing
+ get() = settings.getBoolean(PreferenceKeys.GIT_REMOTE_USE_MULTIPLEXING, true)
+ set(value) {
+ settings.edit {
+ putBoolean(PreferenceKeys.GIT_REMOTE_USE_MULTIPLEXING, value)
+ }
+ }
sealed class UpdateConnectionSettingsResult {
class MissingUsername(val newProtocol: Protocol) : UpdateConnectionSettingsResult()