Merge pull request #2360 from hussainmohd-a/main

fix: revert db fields to previous correct values

Author: hussainmohd-a

app/src/main/java/com/celzero/bravedns/database/AppDatabase.kt

@@ -53,7 +53,7 @@ import com.celzero.bravedns.util.Constants
         SubscriptionStatus::class,
         SubscriptionStateHistory::class
     ],
-    version = 27,
+    version = 26,
     exportSchema = false
 )
 @TypeConverters(Converters::class)
@@ -100,7 +100,6 @@ abstract class AppDatabase : RoomDatabase() {
                 .addMigrations(MIGRATION_23_24)
                 .addMigrations(MIGRATION_24_25)
                 .addMigrations(MIGRATION_25_26)
-                .addMigrations(MIGRATION_26_27)
                 .build()
 
         private val roomCallback: Callback =
@@ -1076,34 +1075,6 @@ abstract class AppDatabase : RoomDatabase() {
                 }
             }
 
-        private val MIGRATION_26_27: Migration =
-            object : Migration(26, 27) {
-                override fun migrate(db: SupportSQLiteDatabase) {
-                    // ProxyEndpoint
-                    db.execSQL("UPDATE ProxyEndpoint SET proxyAppName = '' WHERE proxyAppName IS NULL")
-                    db.execSQL("UPDATE ProxyEndpoint SET proxyIP = '' WHERE proxyIP IS NULL")
-                    db.execSQL("UPDATE ProxyEndpoint SET userName = '' WHERE userName IS NULL")
-                    db.execSQL("UPDATE ProxyEndpoint SET password = '' WHERE password IS NULL")
-                        
-                    // DoHEndpoint
-                    db.execSQL("UPDATE DoHEndpoint SET dohExplanation = '' WHERE dohExplanation IS NULL")
-                    // DoTEndpoint
-                    db.execSQL("UPDATE DoTEndpoint SET desc = '' WHERE desc IS NULL")
-                    // ODoHEndpoint
-                    db.execSQL("UPDATE ODoHEndpoint SET desc = '' WHERE desc IS NULL")
-                    // DNSCryptEndpoint
-                    db.execSQL("UPDATE DNSCryptEndpoint SET dnsCryptExplanation = '' WHERE dnsCryptExplanation IS NULL")
-                    // DNSCryptRelayEndpoint
-                    db.execSQL("UPDATE DNSCryptRelayEndpoint SET dnsCryptRelayExplanation = '' WHERE dnsCryptRelayExplanation IS NULL")
-                    // DNSProxyEndpoint
-                    db.execSQL("UPDATE DNSProxyEndpoint SET proxyAppName = '' WHERE proxyAppName IS NULL")
-                    db.execSQL("UPDATE DNSProxyEndpoint SET proxyIP = '' WHERE proxyIP IS NULL")
-                    
-                    Logger.i(LOG_TAG_APP_DB, "MIGRATION_25_26: Updated ProxyEndpoint, DNSCryptEndpoint, DNSCryptRelayEndpoint, DNSProxyEndpoint, DoHEndpoint, DoTEndpoint, ODoHEndpoint to replace NULL with empty strings")
-    
-                }
-            }
-
 
         // ref: stackoverflow.com/a/57204285
         private fun doesColumnExistInTable(

app/src/main/java/com/celzero/bravedns/database/DnsCryptEndpoint.kt

@@ -24,7 +24,7 @@ class DnsCryptEndpoint {
     @PrimaryKey(autoGenerate = true) var id: Int = 0
     var dnsCryptName: String = ""
     var dnsCryptURL: String = ""
-    var dnsCryptExplanation: String = ""
+    var dnsCryptExplanation: String? = null
     var isSelected: Boolean = true
     var isCustom: Boolean = true
     var modifiedDataTime: Long = INIT_TIME_MS
@@ -44,7 +44,7 @@ class DnsCryptEndpoint {
         id: Int,
         dnsCryptName: String,
         dnsCryptURL: String,
-        dnsCryptExplanation: String,
+        dnsCryptExplanation: String?,
         isSelected: Boolean,
         isCustom: Boolean,
         modifiedDataTime: Long,

app/src/main/java/com/celzero/bravedns/database/DnsCryptRelayEndpoint.kt

@@ -24,7 +24,7 @@ class DnsCryptRelayEndpoint {
     @PrimaryKey(autoGenerate = true) var id: Int = 0
     var dnsCryptRelayName: String = ""
     var dnsCryptRelayURL: String = ""
-    var dnsCryptRelayExplanation: String = ""
+    var dnsCryptRelayExplanation: String? = null
     var isSelected: Boolean = true
     var isCustom: Boolean = true
     var modifiedDataTime: Long = INIT_TIME_MS
@@ -44,7 +44,7 @@ class DnsCryptRelayEndpoint {
         id: Int,
         dnsCryptRelayName: String,
         dnsCryptRelayURL: String,
-        dnsCryptRelayExplanation: String,
+        dnsCryptRelayExplanation: String?,
         isSelected: Boolean,
         isCustom: Boolean,
         modifiedDataTime: Long,

app/src/main/java/com/celzero/bravedns/database/DnsProxyEndpoint.kt

@@ -26,8 +26,8 @@ class DnsProxyEndpoint {
     @PrimaryKey(autoGenerate = true) var id: Int = 0
     var proxyName: String = ""
     var proxyType: String = ""
-    var proxyAppName: String = ""
-    var proxyIP: String = ""
+    var proxyAppName: String? = null
+    var proxyIP: String? = null
     var proxyPort: Int = 0
     var isSelected: Boolean = true
     var isCustom: Boolean = true
@@ -48,8 +48,8 @@ class DnsProxyEndpoint {
         id: Int,
         proxyName: String,
         proxyType: String,
-        proxyAppName: String,
-        proxyIP: String,
+        proxyAppName: String?,
+        proxyIP: String?,
         proxyPort: Int,
         isSelected: Boolean,
         isCustom: Boolean,

app/src/main/java/com/celzero/bravedns/database/DoHEndpoint.kt

@@ -25,7 +25,7 @@ class DoHEndpoint {
     @PrimaryKey(autoGenerate = true) var id: Int = 0
     var dohName: String = ""
     var dohURL: String = ""
-    var dohExplanation: String = ""
+    var dohExplanation: String? = null
     var isSelected: Boolean = true
     var isCustom: Boolean = true
     var isSecure: Boolean = true
@@ -49,7 +49,7 @@ class DoHEndpoint {
         id: Int,
         dohName: String,
         dohURL: String,
-        dohExplanation: String,
+        dohExplanation: String?,
         isSelected: Boolean,
         isCustom: Boolean,
         isSecure: Boolean,

app/src/main/java/com/celzero/bravedns/database/DoTEndpoint.kt

@@ -25,7 +25,7 @@ class DoTEndpoint {
     @PrimaryKey(autoGenerate = true) var id: Int = 0
     var name: String = ""
     var url: String = ""
-    var desc: String = ""
+    var desc: String? = null
     var isSelected: Boolean = true
     var isCustom: Boolean = true
     var isSecure: Boolean = true
@@ -49,7 +49,7 @@ class DoTEndpoint {
         id: Int,
         name: String,
         url: String,
-        desc: String,
+        desc: String?,
         isSelected: Boolean,
         isCustom: Boolean,
         isSecure: Boolean,

app/src/main/java/com/celzero/bravedns/database/ODoHEndpoint.kt

@@ -27,7 +27,7 @@ class ODoHEndpoint {
     var proxy: String = ""
     var resolver: String = ""
     var proxyIps: String = ""
-    var desc: String = ""
+    var desc: String? = null
     var isSelected: Boolean = true
     var isCustom: Boolean = true
     var modifiedDataTime: Long = INIT_TIME_MS
@@ -53,7 +53,7 @@ class ODoHEndpoint {
         proxy: String,
         resolver: String,
         proxyIps: String,
-        desc: String,
+        desc: String?,
         isSelected: Boolean,
         isCustom: Boolean,
         modifiedDataTime: Long,

app/src/main/java/com/celzero/bravedns/database/ProxyEndpoint.kt

@@ -30,11 +30,11 @@ class ProxyEndpoint {
     // NONE for now, later we can add other types
     // ideally this should be an enum (ProxyType)
     var proxyType: String = ""
-    var proxyAppName: String = ""
-    var proxyIP: String = ""
+    var proxyAppName: String? = null
+    var proxyIP: String? = null
     var proxyPort: Int = 0
-    var userName: String = ""
-    var password: String = ""
+    var userName: String? = null
+    var password: String? = null
     var isSelected: Boolean = true
     var isCustom: Boolean = true
     var isUDP: Boolean = false
@@ -56,11 +56,11 @@ class ProxyEndpoint {
         proxyName: String,
         proxyMode: Int,
         proxyType: String,
-        proxyAppName: String,
-        proxyIP: String,
+        proxyAppName: String?,
+        proxyIP: String?,
         proxyPort: Int,
-        userName: String,
-        password: String,
+        userName: String?,
+        password: String?,
         isSelected: Boolean,
         isCustom: Boolean,
         isUDP: Boolean,