Преглед на файлове

Dont set default proxy settings

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk преди 1 година
родител
ревизия
ce0bb853bd

+ 0 - 15
app/src/androidTest/java/com/nextcloud/utils/AppConfigManagerTests.kt

@@ -58,21 +58,6 @@ class AppConfigManagerTests : AbstractIT() {
         assert(proxyPort == -1)
     }
 
-    @Test
-    fun testSetProxyConfigWhenGivenClientBrandedPlusAndBrokenBundleDataProxyConfigurationShouldSetDefaultValues() {
-        val proxySetting = Bundle()
-
-        AppConfigManager(targetContext, proxySetting).run {
-            setProxyConfig(true)
-        }
-
-        val proxyHost = OwnCloudClientManagerFactory.getProxyHost()
-        val proxyPort = OwnCloudClientManagerFactory.getProxyPort()
-
-        assert(proxyHost.equals(""))
-        assert(proxyPort == -1)
-    }
-
     @Test
     fun testGetBaseUrlConfigWhenGivenClientBrandedPlusAndCorrectBundleDataBaseUrlConfigurationShouldSet() {
         val baseUrlConfig = Bundle().apply {

+ 6 - 0
app/src/main/java/com/owncloud/android/utils/appConfig/AppConfigManager.kt

@@ -10,6 +10,7 @@ package com.owncloud.android.utils.appConfig
 import android.content.Context
 import android.content.res.Resources
 import android.os.Bundle
+import android.text.TextUtils
 import com.owncloud.android.R
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
 import com.owncloud.android.lib.common.utils.Log_OC
@@ -36,6 +37,11 @@ class AppConfigManager(private val context: Context, private val appRestrictions
             context.resources.getInteger(R.integer.proxy_port)
         }
 
+        if (TextUtils.isEmpty(host) || port == -1) {
+            Log_OC.d(tag, "Proxy configuration cannot be found")
+            return
+        }
+
         try {
             OwnCloudClientManagerFactory.setProxyHost(host)
             OwnCloudClientManagerFactory.setProxyPort(port)