diff options
Diffstat (limited to 'app/src/main/java/dev/msfjarvis/aps/util/settings')
| -rw-r--r-- | app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt | 3 | ||||
| -rw-r--r-- | app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt index 8cbf84d9..4f5187c4 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt @@ -150,7 +150,8 @@ constructor( in listOf("ssh", null) -> Protocol.Ssh else -> return UpdateConnectionSettingsResult.FailedToParseUrl } - if ((newAuthMode != AuthMode.None && newProtocol != Protocol.Https) && + if ( + (newAuthMode != AuthMode.None && newProtocol != Protocol.Https) && parsedUrl.user.isNullOrBlank() ) return UpdateConnectionSettingsResult.MissingUsername(newProtocol) diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt index b90856b1..b96e538f 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt @@ -77,7 +77,8 @@ private fun migrateToGitUrlBasedConfig(sharedPrefs: SharedPreferences, gitSettin remove(PreferenceKeys.GIT_REMOTE_USERNAME) remove(PreferenceKeys.GIT_REMOTE_PROTOCOL) } - if (url == null || + if ( + url == null || gitSettings.updateConnectionSettingsIfValid( newAuthMode = gitSettings.authMode, newUrl = url, @@ -99,7 +100,8 @@ private fun migrateToHideAll(sharedPrefs: SharedPreferences) { private fun migrateToSshKey(filesDirPath: String, sharedPrefs: SharedPreferences) { val privateKeyFile = File(filesDirPath, ".ssh_key") - if (sharedPrefs.contains(PreferenceKeys.USE_GENERATED_KEY) && + if ( + sharedPrefs.contains(PreferenceKeys.USE_GENERATED_KEY) && !SshKey.exists && privateKeyFile.exists() ) { |