Revert "Allow to connect to HTTP endpoints if not in the production environment."

eriksson · eriksson · commit dc30e78e41c0 · 2023-03-21T00:58:29.000Z
This reverts commit 95f3f52.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -18,7 +18,6 @@
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/android/app/src/main/java/com/httpsms/LoginActivity.kt b/android/app/src/main/java/com/httpsms/LoginActivity.kt
@@ -127,7 +127,7 @@ class LoginActivity : AppCompatActivity() {
             return
         }
 
-        if (Settings.isProductionEnvironment(this) && !URLUtil.isHttpsUrl(serverUrl.text.toString().trim())) {
+        if (!URLUtil.isHttpsUrl(serverUrl.text.toString().trim())) {
             Timber.e("url number [${serverUrl.text.toString()}] is not an https URL")
             resetView()
             serverUrlLayout.error = "Server URL [${serverUrl.text.toString()}] must be HTTPS"
diff --git a/android/app/src/main/java/com/httpsms/Settings.kt b/android/app/src/main/java/com/httpsms/Settings.kt
@@ -15,7 +15,6 @@ object Settings {
     private const val SETTINGS_FCM_TOKEN = "SETTINGS_FCM_TOKEN"
     private const val SETTINGS_FCM_TOKEN_UPDATE_TIMESTAMP = "SETTINGS_FCM_TOKEN_UPDATE_TIMESTAMP"
     private const val SETTINGS_HEARTBEAT_TIMESTAMP = "SETTINGS_HEARTBEAT_TIMESTAMP"
-    private const val SETTINGS_PRODUCTION_ENV = "SETTINGS_PRODUCTION_ENV";
 
     fun getOwner(context: Context): String? {
         Timber.d(Settings::getOwner.name)
@@ -83,17 +82,6 @@ object Settings {
         return activeStatus
     }
 
-    fun isProductionEnvironment(context: Context): Boolean {
-        Timber.d(Settings::isProductionEnvironment.name)
-
-        val isProductionEnv = PreferenceManager
-            .getDefaultSharedPreferences(context)
-            .getBoolean(this.SETTINGS_PRODUCTION_ENV, true)
-
-        Timber.d("SETTINGS_PRODUCTION_ENV: [$isProductionEnv]")
-        return isProductionEnv
-    }
-
     fun setActiveStatusAsync(context: Context, status: Boolean) {
         Timber.d(Settings::setActiveStatusAsync.name)
 
diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ class LoginActivity : AppCompatActivity() {`
`127`	`127`	`return`
`128`	`128`	`}`
`129`	`129`
`130`		`- if (Settings.isProductionEnvironment(this) && !URLUtil.isHttpsUrl(serverUrl.text.toString().trim())) {`
	`130`	`+ if (!URLUtil.isHttpsUrl(serverUrl.text.toString().trim())) {`
`131`	`131`	`Timber.e("url number [${serverUrl.text.toString()}] is not an https URL")`
`132`	`132`	`resetView()`
`133`	`133`	`serverUrlLayout.error = "Server URL [${serverUrl.text.toString()}] must be HTTPS"`