summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt9
-rw-r--r--app/src/main/res/values/strings.xml2
2 files changed, 11 insertions, 0 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
index 56d9c043..372d5863 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
@@ -116,6 +116,15 @@ class GitServerConfigActivity : BaseGitActivity() {
return@setOnClickListener
}
}
+ if (newUrl.startsWith("git://")) {
+ BasicBottomSheet.Builder(this)
+ .setTitleRes(R.string.git_scheme_disallowed_title)
+ .setMessageRes(R.string.git_scheme_disallowed_message)
+ .setPositiveButtonClickListener {}
+ .build()
+ .show(supportFragmentManager, "SSH_SCHEME_WARNING")
+ return@setOnClickListener
+ }
when (val updateResult =
GitSettings.updateConnectionSettingsIfValid(
newAuthMode = newAuthMode,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b9a371d8..e077bf11 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -389,6 +389,8 @@
<string name="ssh_scheme_needed_message">It appears that your URL contains a custom port, but does not specify the ssh:// scheme.\nThis can cause the port to be considered a part of your path. Press OK here to fix the URL.</string>
<string name="https_scheme_with_port_title">HTTPS URL with custom port</string>
<string name="https_scheme_with_port_message">It looks like you are using a HTTPS URL with a custom port. This is not supported, and will cause problems down the line. Press OK to remove the port from your URL.</string>
+ <string name="git_scheme_disallowed_title">Using the git:// protocol is discouraged</string>
+ <string name="git_scheme_disallowed_message">The git protocol provided by git-daemon performs no transport encryption and is unsuitable for secure operations.</string>
<!-- Proxy configuration activity -->
<string name="proxy_hostname">Proxy hostname</string>