fix: connectivity service

app/src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt

@@ -9,7 +9,6 @@ package com.nextcloud.client.network
 
 import android.accounts.AccountManager
 import android.content.Context
-import android.net.ConnectivityManager
 import com.nextcloud.client.account.UserAccountManagerImpl
 import com.nextcloud.client.core.ClockImpl
 import com.nextcloud.client.network.ConnectivityServiceImpl.GetRequestBuilder
@@ -21,15 +20,14 @@ import org.junit.Test
 class ConnectivityServiceImplIT : AbstractOnServerIT() {
     @Test
     fun testInternetWalled() {
-        val connectivityManager = targetContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
         val accountManager = targetContext.getSystemService(Context.ACCOUNT_SERVICE) as AccountManager
         val userAccountManager = UserAccountManagerImpl(targetContext, accountManager)
         val clientFactory = ClientFactoryImpl(targetContext)
         val requestBuilder = GetRequestBuilder()
         val walledCheckCache = WalledCheckCache(ClockImpl())
 
         val sut = ConnectivityServiceImpl(
-            connectivityManager,
+            targetContext,
             userAccountManager,
             clientFactory,
             requestBuilder,

app/src/main/java/com/nextcloud/client/network/ConnectivityService.java

@@ -7,6 +7,12 @@
 package com.nextcloud.client.network;
 
 
+import android.net.ConnectivityManager;
+import android.net.Network;
+
+import com.nextcloud.client.account.Server;
+import com.nextcloud.client.account.UserAccountManager;
+
 import androidx.annotation.NonNull;
 
 /**
@@ -15,31 +21,67 @@
  */
 public interface ConnectivityService {
     /**
-     * Checks the availability of the server and the device's internet connection.
-     * <p>
-     * This method performs a network request to verify if the server is accessible and
-     * checks if the device has an active internet connection.
-     * </p>
+     * Asynchronously checks whether both the device's network connection
+     * and the Nextcloud server are available.
+     *
+     * <p>This method executes its logic on a background thread and posts the result
+     * back to the main thread through the provided {@link GenericCallback}.</p>
+     *
+     * <p>The check is based on {@link #isInternetWalled()} — if the Internet is not
+     * walled (i.e., the server is reachable and not restricted by a captive portal),
+     * this method reports {@code true}. Otherwise, it reports {@code false}.</p>
      *
-     * @param callback A callback to handle the result of the network and server availability check.
+     * @param callback a callback that receives {@code true} when the network and
+     *                 Nextcloud server are reachable, or {@code false} otherwise.
      */
     void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback);
 
+    /**
+     * Checks whether the device currently has an active, validated Internet connection
+     * via a recognized transport type.
+     *
+     * <p>This method queries the Android {@link ConnectivityManager} to determine
+     * whether there is an active {@link Network} with Internet capability and an
+     * acceptable transport such as Wi-Fi, Cellular, Ethernet, VPN, or Bluetooth.</p>
+     *
+     * <p>For Android 12 (API 31) and newer, USB network transport is also considered valid.</p>
+     *
+     * <p>Note: This only confirms that the Android system has validated Internet access,
+     * not necessarily that the Nextcloud server itself is reachable.</p>
+     *
+     * @return {@code true} if the device is connected to the Internet through a supported
+     *         transport type; {@code false} otherwise.
+     */
     boolean isConnected();
 
     /**
-     * Check if server is accessible by issuing HTTP status check request.
-     * Since this call involves network traffic, it should not be called
-     * on a main thread.
+     * Determines whether the device's current Internet connection is "walled" — that is,
+     * restricted by a captive portal or other form of network access control that prevents
+     * full connectivity to the Nextcloud server.
+     *
+     * <p>This method does <strong>not</strong> test general Internet reachability (e.g. Google or DNS),
+     * but rather focuses on the ability to access the configured Nextcloud server directly.
+     * In other words, it checks whether the server can be reached without network interference
+     * such as a hotel's captive portal, Wi-Fi login page, or similar restrictions.</p>
      *
-     * @return True if server is unreachable, false otherwise
+     * <p>Results are cached for subsequent checks to minimize unnecessary HTTP requests.</p>
+     *
+     * @return {@code true} if the Internet appears to be walled (e.g. captive portal or
+     *         restricted access); {@code false} if the Nextcloud server is reachable and
+     *         the network allows normal Internet access.
      */
     boolean isInternetWalled();
 
     /**
-     * Get current network connectivity status.
+     * Returns a {@link Connectivity} object that represents the current network state.
+     *
+     * <p>This includes whether the device is connected, whether the network is metered,
+     * and whether it uses Wi-Fi or Ethernet transport. It uses
+     * {@link #isConnected()} to verify active Internet capability</p>
+     *
+     * <p>If no active network is found, {@link Connectivity#DISCONNECTED} is returned.</p>
      *
-     * @return Network connectivity status in platform-agnostic format
+     * @return a {@link Connectivity} instance describing the current network connection.
      */
     Connectivity getConnectivity();