diff options
| author | ashoksinghal <ashoksinghal1990@gmail.com> | 2020-10-17 22:09:34 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 22:09:34 +0530 |
| commit | 3981638e0f8d714567f6a3c3a25dc54599263af2 (patch) | |
| tree | 4148e109a1c0b7eb75b24e24be120a2a7edf8d36 /app/src/main/java/com/zeapo/pwdstore/git | |
| parent | 6c1e41ba1050c92f4b615f7e857e0d085120a242 (diff) | |
| download | HardenedPass-3981638e0f8d714567f6a3c3a25dc54599263af2.tar.gz HardenedPass-3981638e0f8d714567f6a3c3a25dc54599263af2.zip | |
Use BottomSheet in place of Snackbar for longer messages (#1157)
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt | 20 |
1 files changed, 17 insertions, 3 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 4b220be5..364dcc1a 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt @@ -115,10 +115,25 @@ class GitServerConfigActivity : BaseGitActivity() { GitSettings.UpdateConnectionSettingsResult.FailedToParseUrl -> { Snackbar.make(binding.root, getString(R.string.git_server_config_save_error), Snackbar.LENGTH_LONG).show() } + is GitSettings.UpdateConnectionSettingsResult.MissingUsername -> { when (updateResult.newProtocol) { - Protocol.Https -> Snackbar.make(binding.root, getString(R.string.git_server_config_save_missing_username_https), Snackbar.LENGTH_LONG).show() - Protocol.Ssh -> Snackbar.make(binding.root, getString(R.string.git_server_config_save_missing_username_ssh), Snackbar.LENGTH_LONG).show() + Protocol.Https -> + BasicBottomSheet.Builder(this) + .setTitleRes(R.string.ssh_scheme_needed_title) + .setMessageRes(R.string.git_server_config_save_missing_username_https) + .setPositiveButtonClickListener { + } + .build() + .show(supportFragmentManager, "HTTPS_MISSING_USERNAME") + Protocol.Ssh -> + BasicBottomSheet.Builder(this) + .setTitleRes(R.string.ssh_scheme_needed_title) + .setMessageRes(R.string.git_server_config_save_missing_username_ssh) + .setPositiveButtonClickListener { + } + .build() + .show(supportFragmentManager, "SSH_MISSING_USERNAME") } } GitSettings.UpdateConnectionSettingsResult.Valid -> { @@ -201,7 +216,6 @@ class GitServerConfigActivity : BaseGitActivity() { // Silently delete & replace the lone .git folder if it exists if (localDir.exists() && localDirFiles.size == 1 && localDirFiles[0].name == ".git") { localDir.deleteRecursively() - } }.onFailure { e -> e(e) |