wip

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt

@@ -37,16 +37,18 @@ class ConnectivityServiceImpl(
     private val requestBuilder: GetRequestBuilder,
     private val walledCheckCache: WalledCheckCache
 ) : ConnectivityService {
+
     private val scope = CoroutineScope(Dispatchers.IO)
+
     private var availabilityCheckJob: Job? = null
+    private var notifyJob: Job? = null
+
     private val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
     private val listeners = mutableSetOf<NetworkChangeListener>()
 
     @Volatile
     private var currentConnectivity: Connectivity = Connectivity.DISCONNECTED
 
-    private var notifyJob: Job? = null
-
     private val key: ConnectivityKey
         get() = ConnectivityKey.getBy(accountManager)
 
@@ -218,33 +220,31 @@ class ConnectivityServiceImpl(
 
     override fun getConnectivity() = currentConnectivity
 
-    private fun getWalledValueFromException(e: Exception): Boolean {
-        return when (e) {
-            is UnknownHostException,
-            is ConnectException -> {
-                Log_OC.w(TAG, "offline exception (${e::class.simpleName}), treating as walled")
-                true
-            }
+    private fun getWalledValueFromException(e: Exception): Boolean = when (e) {
+        is UnknownHostException,
+        is ConnectException -> {
+            Log_OC.w(TAG, "offline exception (${e::class.simpleName}), treating as walled")
+            true
+        }
 
-            is SocketTimeoutException -> {
-                Log_OC.w(TAG, "timeout during server check, treating as walled")
-                true
-            }
+        is SocketTimeoutException -> {
+            Log_OC.w(TAG, "timeout during server check, treating as walled")
+            true
+        }
 
-            is SSLException -> {
-                Log_OC.w(TAG, "SSL exception during server check, assuming reachable")
-                false
-            }
+        is SSLException -> {
+            Log_OC.w(TAG, "SSL exception during server check, assuming reachable")
+            false
+        }
 
-            is IOException -> {
-                Log_OC.w(TAG, "I/O exception (${e::class.simpleName}), treating as walled")
-                true
-            }
+        is IOException -> {
+            Log_OC.w(TAG, "I/O exception (${e::class.simpleName}), treating as walled")
+            true
+        }
 
-            else -> {
-                Log_OC.e(TAG, "unexpected exception type (${e::class.simpleName}), using previous state")
-                currentConnectivity.isServerAvailable?.let { !it } ?: true
-            }
+        else -> {
+            Log_OC.e(TAG, "unexpected exception type (${e::class.simpleName}), using previous state")
+            currentConnectivity.isServerAvailable?.let { !it } ?: true
         }
     }
 

app/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt

@@ -112,6 +112,7 @@ class ConnectivityServiceTest {
                 .thenReturn(platformConnectivityManager)
 
             whenever(platformConnectivityManager.activeNetwork).thenReturn(network)
+            whenever(platformConnectivityManager.allNetworks).thenReturn(arrayOf(network))
             whenever(platformConnectivityManager.getNetworkCapabilities(network))
                 .thenReturn(networkCapabilities)
 
@@ -126,6 +127,7 @@ class ConnectivityServiceTest {
             whenever(requestBuilder.invoke(any())).thenReturn(getRequest)
             whenever(clientFactory.createPlainClient()).thenReturn(client)
             whenever(user.server).thenReturn(newServer)
+            whenever(user.accountName).thenReturn("test@nextcloud.localhost")
             whenever(accountManager.user).thenReturn(user)
 
             val key = ConnectivityKey(user.accountName, newServer.uri.toString())
@@ -152,6 +154,7 @@ class ConnectivityServiceTest {
         fun `no active network`() {
             // GIVEN
             whenever(platformConnectivityManager.activeNetwork).thenReturn(null)
+            whenever(platformConnectivityManager.allNetworks).thenReturn(emptyArray())
             // WHEN
             connectivityService.updateConnectivity()
             // THEN
@@ -271,6 +274,7 @@ class ConnectivityServiceTest {
             // GIVEN
             //      network is not connected
             whenever(platformConnectivityManager.activeNetwork).thenReturn(null)
+            whenever(platformConnectivityManager.allNetworks).thenReturn(emptyArray())
             connectivityService.updateConnectivity()
             assertFalse("Precondition failed", connectivityService.isConnected)