fix(connectivity-service): usages

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

@@ -36,6 +36,6 @@ class ConnectivityServiceImplIT : AbstractOnServerIT() {
         )
 
         assertTrue(sut.connectivity.isConnected)
-        assertFalse(sut.isInternetWalled)
+        assertFalse(sut.isInternetWalled())
     }
 }

app/src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -30,9 +30,8 @@
 import com.nextcloud.client.device.BatteryStatus;
 import com.nextcloud.client.device.PowerManagementService;
 import com.nextcloud.client.jobs.upload.FileUploadWorker;
-import com.nextcloud.client.network.Connectivity;
+import com.nextcloud.client.network.ConnectivityManagerFactory;
 import com.nextcloud.client.network.ConnectivityService;
-import com.nextcloud.client.network.NetworkChangeListener;
 import com.nextcloud.client.preferences.AppPreferencesImpl;
 import com.nextcloud.client.preferences.DarkMode;
 import com.nextcloud.common.NextcloudClient;
@@ -101,6 +100,8 @@ public abstract class AbstractIT {
     @Rule
     public GrantPermissionRule notificationsPermissionRule = GrantPermissionRule.grant(Manifest.permission.POST_NOTIFICATIONS);
 
+    protected ConnectivityService connectivityServiceMock = ConnectivityManagerFactory.INSTANCE.getMock();
+
     protected static OwnCloudClient client;
     protected static NextcloudClient nextcloudClient;
     protected static Account account;
@@ -371,38 +372,6 @@ public void uploadFile(File file, String remotePath) {
     }
 
     public void uploadOCUpload(OCUpload ocUpload) {
-        ConnectivityService connectivityServiceMock = new ConnectivityService() {
-            @Override
-            public void addListener(@NonNull NetworkChangeListener listener) {
-
-            }
-
-            @Override
-            public void removeListener(@NonNull NetworkChangeListener listener) {
-
-            }
-
-            @Override
-            public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
-
-            }
-
-            @Override
-            public boolean isConnected() {
-                return false;
-            }
-
-            @Override
-            public boolean isInternetWalled() {
-                return false;
-            }
-
-            @Override
-            public Connectivity getConnectivity() {
-                return Connectivity.CONNECTED_WIFI;
-            }
-        };
-
         PowerManagementService powerManagementServiceMock = new PowerManagementService() {
             @Override
             public boolean isIgnoringOptimization() {

app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java

@@ -19,9 +19,6 @@
 import com.nextcloud.client.device.BatteryStatus;
 import com.nextcloud.client.device.PowerManagementService;
 import com.nextcloud.client.jobs.upload.FileUploadWorker;
-import com.nextcloud.client.network.Connectivity;
-import com.nextcloud.client.network.ConnectivityService;
-import com.nextcloud.client.network.NetworkChangeListener;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.db.OCUpload;
@@ -203,38 +200,6 @@ public void uploadOCUpload(OCUpload ocUpload) {
     }
 
     public void uploadOCUpload(OCUpload ocUpload, int localBehaviour) {
-        ConnectivityService connectivityServiceMock = new ConnectivityService() {
-            @Override
-            public void addListener(@NonNull NetworkChangeListener listener) {
-
-            }
-
-            @Override
-            public void removeListener(@NonNull NetworkChangeListener listener) {
-
-            }
-
-            @Override
-            public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
-                callback.onComplete(true);
-            }
-
-            @Override
-            public boolean isConnected() {
-                return true;
-            }
-
-            @Override
-            public boolean isInternetWalled() {
-                return false;
-            }
-
-            @Override
-            public Connectivity getConnectivity() {
-                return Connectivity.CONNECTED_WIFI;
-            }
-        };
-
         PowerManagementService powerManagementServiceMock = new PowerManagementService() {
             @Override
             public boolean isIgnoringOptimization() {

app/src/androidTest/java/com/owncloud/android/UploadIT.java

@@ -12,9 +12,8 @@
 import com.nextcloud.client.device.BatteryStatus;
 import com.nextcloud.client.device.PowerManagementService;
 import com.nextcloud.client.jobs.upload.FileUploadWorker;
-import com.nextcloud.client.network.Connectivity;
+import com.nextcloud.client.network.ConnectivityManagerFactory;
 import com.nextcloud.client.network.ConnectivityService;
-import com.nextcloud.client.network.NetworkChangeListener;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.db.OCUpload;
@@ -56,38 +55,6 @@ public class UploadIT extends AbstractOnServerIT {
         new UploadsStorageManager(UserAccountManagerImpl.fromContext(targetContext),
                                   targetContext.getContentResolver());
 
-    private ConnectivityService connectivityServiceMock = new ConnectivityService() {
-        @Override
-        public void addListener(@NonNull NetworkChangeListener listener) {
-
-        }
-
-        @Override
-        public void removeListener(@NonNull NetworkChangeListener listener) {
-
-        }
-
-        @Override
-        public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
-
-        }
-
-        @Override
-        public boolean isConnected() {
-            return false;
-        }
-
-        @Override
-        public boolean isInternetWalled() {
-            return false;
-        }
-
-        @Override
-        public Connectivity getConnectivity() {
-            return Connectivity.CONNECTED_WIFI;
-        }
-    };
-
     private PowerManagementService powerManagementServiceMock = new PowerManagementService() {
         @Override
         public boolean isIgnoringOptimization() {
@@ -288,37 +255,7 @@ public BatteryStatus getBattery() {
 
     @Test
     public void testUploadOnWifiOnlyButNoWifi() {
-        ConnectivityService connectivityServiceMock = new ConnectivityService() {
-            @Override
-            public void addListener(@NonNull NetworkChangeListener listener) {
-
-            }
-
-            @Override
-            public void removeListener(@NonNull NetworkChangeListener listener) {
-
-            }
-
-            @Override
-            public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
-
-            }
-
-            @Override
-            public boolean isConnected() {
-                return false;
-            }
-
-            @Override
-            public boolean isInternetWalled() {
-                return false;
-            }
-
-            @Override
-            public Connectivity getConnectivity() {
-                return new Connectivity(true, false, false, true, false);
-            }
-        };
+        ConnectivityService connectivityServiceMock = ConnectivityManagerFactory.INSTANCE.getWifi();
         OCUpload ocUpload = new OCUpload(FileStorageUtils.getTemporalPath(account.name) + "/empty.txt",
                                          FOLDER + "noWifi.txt", account.name);
         ocUpload.setUseWifiOnly(true);
@@ -387,37 +324,7 @@ public void testUploadOnWifiOnlyAndWifi() {
 
     @Test
     public void testUploadOnWifiOnlyButMeteredWifi() {
-        ConnectivityService connectivityServiceMock = new ConnectivityService() {
-            @Override
-            public void addListener(@NonNull NetworkChangeListener listener) {
-
-            }
-
-            @Override
-            public void removeListener(@NonNull NetworkChangeListener listener) {
-
-            }
-
-            @Override
-            public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
-
-            }
-
-            @Override
-            public boolean isConnected() {
-                return false;
-            }
-
-            @Override
-            public boolean isInternetWalled() {
-                return false;
-            }
-
-            @Override
-            public Connectivity getConnectivity() {
-                return new Connectivity(true, true, true, true, false);
-            }
-        };
+        ConnectivityService connectivityServiceMock = ConnectivityManagerFactory.INSTANCE.getMetered();
         OCUpload ocUpload = new OCUpload(FileStorageUtils.getTemporalPath(account.name) + "/empty.txt",
                                          FOLDER + "noWifi.txt",
                                          account.name);

app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt

@@ -14,9 +14,6 @@ import com.nextcloud.client.device.BatteryStatus
 import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.jobs.upload.FileUploadHelper
 import com.nextcloud.client.jobs.upload.FileUploadWorker
-import com.nextcloud.client.network.Connectivity
-import com.nextcloud.client.network.ConnectivityService
-import com.nextcloud.client.network.NetworkChangeListener
 import com.owncloud.android.AbstractOnServerIT
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.UploadsStorageManager
@@ -34,15 +31,6 @@ import org.junit.Test
 abstract class FileUploaderIT : AbstractOnServerIT() {
     private var uploadsStorageManager: UploadsStorageManager? = null
 
-    private val connectivityServiceMock: ConnectivityService = object : ConnectivityService {
-        override fun addListener(listener: NetworkChangeListener) = Unit
-        override fun removeListener(listener: NetworkChangeListener) = Unit
-        override fun isNetworkAndServerAvailable(callback: ConnectivityService.GenericCallback<Boolean>) = Unit
-        override fun isConnected(): Boolean = false
-        override fun isInternetWalled(): Boolean = false
-        override fun getConnectivity(): Connectivity = Connectivity.CONNECTED_WIFI
-    }
-
     private val powerManagementServiceMock: PowerManagementService = object : PowerManagementService {
         override val isIgnoringOptimization: Boolean
             get() = true

app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageActivityIT.kt

@@ -21,7 +21,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import com.nextcloud.test.ConnectivityServiceOfflineMock
 import com.nextcloud.test.FileRemovedIdlingResource
 import com.nextcloud.test.LoopFailureHandler
 import com.owncloud.android.AbstractOnServerIT
@@ -164,7 +163,7 @@ class PreviewImageActivityIT : AbstractOnServerIT() {
         launchActivity<PreviewImageActivity>(intent).use { scenario ->
             if (offline) {
                 scenario.onActivity { activity ->
-                    activity.connectivityService = ConnectivityServiceOfflineMock()
+                    activity.connectivityService = connectivityServiceMock
                 }
             }
             onView(isRoot()).check(matches(isDisplayed()))

app/src/debug/java/com/nextcloud/test/TestActivity.kt

@@ -14,9 +14,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.nextcloud.client.database.NextcloudDatabase
 import com.nextcloud.client.jobs.download.FileDownloadWorker
 import com.nextcloud.client.jobs.upload.FileUploadHelper
-import com.nextcloud.client.network.Connectivity
-import com.nextcloud.client.network.ConnectivityService
-import com.nextcloud.client.network.NetworkChangeListener
+import com.nextcloud.client.network.ConnectivityManagerFactory
 import com.nextcloud.utils.EditorUtils
 import com.owncloud.android.R
 import com.owncloud.android.databinding.TestLayoutBinding
@@ -43,14 +41,7 @@ class TestActivity :
     private lateinit var fileOperation: FileOperationsHelper
     private lateinit var binding: TestLayoutBinding
 
-    val connectivityServiceMock: ConnectivityService = object : ConnectivityService {
-        override fun addListener(listener: NetworkChangeListener) = Unit
-        override fun removeListener(listener: NetworkChangeListener) = Unit
-        override fun isNetworkAndServerAvailable(callback: ConnectivityService.GenericCallback<Boolean>) = Unit
-        override fun isConnected(): Boolean = false
-        override fun isInternetWalled(): Boolean = false
-        override fun getConnectivity(): Connectivity = Connectivity.CONNECTED_WIFI
-    }
+    val connectivityServiceMock = ConnectivityManagerFactory.mock
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/nextcloud/client/jobs/InternalTwoWaySyncWork.kt

@@ -43,7 +43,7 @@ class InternalTwoWaySyncWork(
         if (!appPreferences.isTwoWaySyncEnabled ||
             powerManagementService.isPowerSavingEnabled ||
             !connectivityService.isConnected ||
-            connectivityService.isInternetWalled ||
+            connectivityService.isInternetWalled() ||
             !connectivityService.connectivity.isWifi
         ) {
             Log_OC.d(TAG, "Not starting due to constraints!")

app/src/main/java/com/nextcloud/client/jobs/OfflineSyncWork.kt

@@ -139,7 +139,7 @@ class OfflineSyncWork(
                 result?.data?.get(0) as? String
             }
 
-            else -> if (connectivityService.isInternetWalled) {
+            else -> if (connectivityService.isInternetWalled()) {
                 Log_OC.d(TAG, "No connectivity, skipping sync")
                 null
             } else {

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt

@@ -407,7 +407,7 @@ class FileUploadHelper {
 
     private fun checkConnectivity(connectivityService: ConnectivityService): Boolean {
         // check that connection isn't walled off and that the server is reachable
-        return connectivityService.getConnectivity().isConnected && !connectivityService.isInternetWalled()
+        return connectivityService.connectivity.isConnected && !connectivityService.isInternetWalled()
     }
 
     /**

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt

@@ -370,7 +370,7 @@ class FileUploadWorker(
 
     private fun canExitEarly(): Boolean {
         val result = !connectivityService.isConnected ||
-            connectivityService.isInternetWalled ||
+            connectivityService.isInternetWalled() ||
             isStopped
 
         if (result) {