refactor all of the settings...

Author: 05nelsonm

topl-android-settings/src/main/java/io/matthewnelson/topl_android_settings/TorSettings.kt

@@ -4,7 +4,7 @@ abstract class TorSettings {
 
     abstract val disableNetwork: Boolean
 
-    abstract val dnsPort: String
+    abstract val dnsPort: Int
 
     abstract val customTorrc: String?
 
@@ -25,7 +25,7 @@ abstract class TorSettings {
 
     abstract val proxyPassword: String?
 
-    abstract val proxyPort: String?
+    abstract val proxyPort: Int?
 
     abstract val proxySocks5Host: String?
 
@@ -41,6 +41,9 @@ abstract class TorSettings {
 
     abstract val relayPort: Int
 
+    /**
+     * Could be a port "9050", or "auto"
+     * */
     abstract val socksPort: String
 
     abstract val virtualAddressNetwork: String?
@@ -75,7 +78,7 @@ abstract class TorSettings {
 
     abstract val runAsDaemon: Boolean
 
-    abstract val transPort: String
+    abstract val transPort: Int?
 
     abstract val useSocks5: Boolean
 }

topl-android/src/main/java/io/matthewnelson/topl_android/settings/DefaultSettings.kt renamed to topl-android/src/main/java/io/matthewnelson/topl_android/settings/DefaultTorSettings.kt

@@ -4,16 +4,16 @@ import io.matthewnelson.topl_android_settings.TorSettings
 import java.util.*
 
 /**
- * Provides some reasonable default settings. Override this class or create a new implementation to
- * make changes.
+ * Provides some reasonable default settings. Override this class or create a new
+ * implementation to make changes.
  */
-open class DefaultSettings : TorSettings() {
+open class DefaultTorSettings : TorSettings() {
 
     override val disableNetwork: Boolean
         get() = true
 
-    override val dnsPort: String
-        get() = "5400"
+    override val dnsPort: Int
+        get() = 5400
 
     override val customTorrc: String?
         get() = null
@@ -39,11 +39,11 @@ open class DefaultSettings : TorSettings() {
     override val proxyPassword: String?
         get() = null
 
-    override val proxyPort: String?
+    override val proxyPort: Int?
         get() = null
 
     override val proxySocks5Host: String?
-        get() = null
+        get() = "127.0.0.1"
 
     override val proxySocks5ServerPort: String?
         get() = null
@@ -67,10 +67,10 @@ open class DefaultSettings : TorSettings() {
         get() = "9050"
 
     override val virtualAddressNetwork: String?
-        get() = null
+        get() = "10.192.0.0/10"
 
     override val hasBridges: Boolean
-        get() = true
+        get() = false
 
     override val hasConnectionPadding: Boolean
         get() = false
@@ -82,7 +82,7 @@ open class DefaultSettings : TorSettings() {
         get() = false
 
     override val hasDormantCanceledByStartup: Boolean
-        get() = false
+        get() = true
 
     override val hasIsolationAddressFlagForTunnel: Boolean
         get() = false
@@ -114,9 +114,9 @@ open class DefaultSettings : TorSettings() {
     override val runAsDaemon: Boolean
         get() = true
 
-    override val transPort: String
-        get() = "9040"
+    override val transPort: Int?
+        get() = 9140
 
     override val useSocks5: Boolean
-        get() = false
+        get() = true
 }