diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-04-20 13:29:10 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 13:29:10 +0530 |
| commit | 47c2875e931a1cd0389d3d21e110beb3a65c0f53 (patch) | |
| tree | e50e01135b02ece7dcdaa2623bfa730b51220c87 /app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt | |
| parent | 99aa0d9bb2b3af2e48fcea04bc5cee8b03a7b75a (diff) | |
| download | HardenedPass-47c2875e931a1cd0389d3d21e110beb3a65c0f53.tar.gz HardenedPass-47c2875e931a1cd0389d3d21e110beb3a65c0f53.zip | |
Fix protocol validation (#726)
* GitOperation: code cleanup
* WIP: Fix validation
* Fixup SSH validation
* Spotless
* Remove logging of MalformedURLException
Co-authored-by: Fabian Henneke <fabian@henneke.me>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt index bf7d5acc..ec73dae6 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt @@ -50,7 +50,7 @@ open class GitOperationActivity : BaseGitActivity() { * @param operation the operation to execute can be REQUEST_PULL or REQUEST_PUSH */ private fun syncRepository(operation: Int) { - if (serverUser.isEmpty() || serverHostname.isEmpty() || url.isEmpty()) + if (serverUser.isEmpty() || serverHostname.isEmpty() || url.isNullOrEmpty()) MaterialAlertDialogBuilder(this) .setMessage(getString(R.string.set_information_dialog_text)) .setPositiveButton(getString(R.string.dialog_positive)) { _, _ -> @@ -65,7 +65,7 @@ open class GitOperationActivity : BaseGitActivity() { .show() else { // check that the remote origin is here, else add it - PasswordRepository.addRemote("origin", url, true) + PasswordRepository.addRemote("origin", url!!, true) launchGitOperation(operation) } } |