From 7a58e397a9323476fcea5d1556b4996e474dc15e Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Fri, 11 Sep 2020 09:58:03 +0200 Subject: Disable SSH multiplexing if not supported (#1093) Co-authored-by: Harsh Shandilya --- .../main/java/com/zeapo/pwdstore/git/config/GitSettings.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/git/config') 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() -- cgit v1.2.3