From b5705b45dfa26ad6c2bcaeb09ed174ebd3628253 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 4 Jun 2023 15:59:44 +0300
Subject: [PATCH] Add port number validation

---
 .../kotatsu/settings/ProxySettingsFragment.kt |  4 +++-
 .../kotatsu/settings/SourceSettingsExt.kt     |  2 ++
 .../{ => utils/validation}/DomainValidator.kt |  2 +-
 .../{ => utils/validation}/HeaderValidator.kt |  2 +-
 .../utils/validation/PortNumberValidator.kt   | 24 +++++++++++++++++++
 .../kotatsu/sync/ui/SyncHostDialogFragment.kt |  2 +-
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 33 insertions(+), 4 deletions(-)
 rename app/src/main/kotlin/org/koitharu/kotatsu/settings/{ => utils/validation}/DomainValidator.kt (93%)
 rename app/src/main/kotlin/org/koitharu/kotatsu/settings/{ => utils/validation}/HeaderValidator.kt (92%)
 create mode 100644 app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/PortNumberValidator.kt

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/ProxySettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/ProxySettingsFragment.kt
index ab6097f5f..4125d46e2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/ProxySettingsFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/ProxySettingsFragment.kt
@@ -13,6 +13,8 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.settings.utils.EditTextBindListener
 import org.koitharu.kotatsu.settings.utils.PasswordSummaryProvider
+import org.koitharu.kotatsu.settings.utils.validation.DomainValidator
+import org.koitharu.kotatsu.settings.utils.validation.PortNumberValidator
 import java.net.Proxy
 
 @AndroidEntryPoint
@@ -32,7 +34,7 @@ class ProxySettingsFragment : BasePreferenceFragment(R.string.proxy),
 			EditTextBindListener(
 				inputType = EditorInfo.TYPE_CLASS_NUMBER,
 				hint = null,
-				validator = null,
+				validator = PortNumberValidator(),
 			),
 		)
 		findPreference<EditTextPreference>(AppSettings.KEY_PROXY_PASSWORD)?.let { pref ->
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsExt.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
index 6a83af617..d0123bee7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
@@ -11,6 +11,8 @@ import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.settings.utils.AutoCompleteTextViewPreference
 import org.koitharu.kotatsu.settings.utils.EditTextBindListener
 import org.koitharu.kotatsu.settings.utils.EditTextDefaultSummaryProvider
+import org.koitharu.kotatsu.settings.utils.validation.DomainValidator
+import org.koitharu.kotatsu.settings.utils.validation.HeaderValidator
 
 fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMangaRepository) {
 	val configKeys = repository.getConfigKeys()
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/DomainValidator.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/DomainValidator.kt
similarity index 93%
rename from app/src/main/kotlin/org/koitharu/kotatsu/settings/DomainValidator.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/DomainValidator.kt
index 0ac467edc..201fabeec 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/DomainValidator.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/DomainValidator.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.settings
+package org.koitharu.kotatsu.settings.utils.validation
 
 import okhttp3.HttpUrl
 import org.koitharu.kotatsu.R
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/HeaderValidator.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/HeaderValidator.kt
similarity index 92%
rename from app/src/main/kotlin/org/koitharu/kotatsu/settings/HeaderValidator.kt
rename to app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/HeaderValidator.kt
index b25be70d6..36891f980 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/HeaderValidator.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/HeaderValidator.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.settings
+package org.koitharu.kotatsu.settings.utils.validation
 
 import okhttp3.Headers
 import org.koitharu.kotatsu.R
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/PortNumberValidator.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/PortNumberValidator.kt
new file mode 100644
index 000000000..3bee9f9a5
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/validation/PortNumberValidator.kt
@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.settings.utils.validation
+
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.EditTextValidator
+
+class PortNumberValidator : EditTextValidator() {
+
+	override fun validate(text: String): ValidationResult {
+		val trimmed = text.trim()
+		if (trimmed.isEmpty()) {
+			return ValidationResult.Success
+		}
+		return if (!checkCharacters(trimmed)) {
+			ValidationResult.Failed(context.getString(R.string.invalid_port_number))
+		} else {
+			ValidationResult.Success
+		}
+	}
+
+	private fun checkCharacters(value: String): Boolean {
+		val intValue = value.toIntOrNull() ?: return false
+		return intValue in 1..65535
+	}
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/SyncHostDialogFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/SyncHostDialogFragment.kt
index 735adb19a..2de3183f4 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/SyncHostDialogFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/SyncHostDialogFragment.kt
@@ -14,7 +14,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.AlertDialogFragment
 import org.koitharu.kotatsu.databinding.PreferenceDialogAutocompletetextviewBinding
-import org.koitharu.kotatsu.settings.DomainValidator
+import org.koitharu.kotatsu.settings.utils.validation.DomainValidator
 import org.koitharu.kotatsu.sync.data.SyncSettings
 import javax.inject.Inject
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eb9f3d1f4..5dad409f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -432,4 +432,5 @@
 	<string name="username">Username</string>
 	<string name="password">Password</string>
 	<string name="authorization_optional">Authorization (optional)</string>
+	<string name="invalid_port_number">Invalid port number</string>
 </resources>