diff options
| author | Fabian Henneke <fabian@henneke.me> | 2020-05-14 11:07:01 +0200 |
|---|---|---|
| committer | Fabian Henneke <FabianHenneke@users.noreply.github.com> | 2020-05-14 12:00:30 +0200 |
| commit | de4ce4453129d3bcf563c5cb6cd1957c9bccb0d4 (patch) | |
| tree | 80d11dde7c8859984589395e81aa6f91d761810d /app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt | |
| parent | f806438f2c822fcf248e431d794aa1d1b65df3fa (diff) | |
| download | HardenedPass-de4ce4453129d3bcf563c5cb6cd1957c9bccb0d4.tar.gz HardenedPass-de4ce4453129d3bcf563c5cb6cd1957c9bccb0d4.zip | |
Add specific error messages to GitServerConfigActivity
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt index 3e5d18e0..f8c67e51 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt @@ -97,22 +97,23 @@ class GitServerConfigActivity : BaseGitActivity() { binding.saveButton.setOnClickListener { if (isClone && PasswordRepository.getRepository(null) == null) PasswordRepository.initialize(this) - if (updateUrl()) { - settings.edit { - putString("git_remote_protocol", protocol.pref) - putString("git_remote_auth", connectionMode.pref) - putString("git_remote_server", serverHostname) - putString("git_remote_port", serverPort) - putString("git_remote_username", serverUser) - putString("git_remote_location", serverPath) + when (val result = updateUrl()) { + GitUpdateUrlResult.Ok -> { + settings.edit { + putString("git_remote_protocol", protocol.pref) + putString("git_remote_auth", connectionMode.pref) + putString("git_remote_server", serverHostname) + putString("git_remote_port", serverPort) + putString("git_remote_username", serverUser) + putString("git_remote_location", serverPath) + } + if (!isClone) { + Snackbar.make(binding.root, getString(R.string.git_server_config_save_success), Snackbar.LENGTH_SHORT).show() + Handler().postDelayed(500) { finish() } + } else + cloneRepository() } - if (!isClone) { - Snackbar.make(binding.root, getString(R.string.git_server_config_save_success), Snackbar.LENGTH_SHORT).show() - Handler().postDelayed(500) { finish() } - } else - cloneRepository() - } else { - Snackbar.make(binding.root, getString(R.string.git_server_config_save_failure), Snackbar.LENGTH_LONG).show() + else -> Snackbar.make(binding.root, getString(R.string.git_server_config_save_error_prefix, getString(result.textRes)), Snackbar.LENGTH_LONG).show() } } } |