Skip to content

Commit c257ebd

Browse files
alperozturk96alperozturk96
authored
Merge pull request #17233 from nextcloud/fix/connectivity-service-scope-usages
fix(connectivity-service): usages
2 parents cf1f780 + 2a52617 commit c257ebd

22 files changed

Lines changed: 193 additions & 351 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ class ConnectivityServiceImplIT : AbstractOnServerIT() {
3636
)
3737

3838
assertTrue(sut.connectivity.isConnected)
39-
assertFalse(sut.isInternetWalled)
39+
assertFalse(sut.isInternetWalled())
4040
}
4141
}

‎app/src/androidTest/java/com/nextcloud/test/ConnectivityServiceOfflineMock.kt‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
import com.nextcloud.client.device.BatteryStatus;
3131
import com.nextcloud.client.device.PowerManagementService;
3232
import com.nextcloud.client.jobs.upload.FileUploadWorker;
33-
import com.nextcloud.client.network.Connectivity;
33+
import com.nextcloud.client.network.ConnectivityManagerFactory;
3434
import com.nextcloud.client.network.ConnectivityService;
35-
import com.nextcloud.client.network.NetworkChangeListener;
3635
import com.nextcloud.client.preferences.AppPreferencesImpl;
3736
import com.nextcloud.client.preferences.DarkMode;
3837
import com.nextcloud.common.NextcloudClient;
@@ -101,6 +100,8 @@ public abstract class AbstractIT {
101100
@Rule
102101
public GrantPermissionRule notificationsPermissionRule = GrantPermissionRule.grant(Manifest.permission.POST_NOTIFICATIONS);
103102

103+
protected ConnectivityService connectivityServiceMock = ConnectivityManagerFactory.INSTANCE.getMock();
104+
104105
protected static OwnCloudClient client;
105106
protected static NextcloudClient nextcloudClient;
106107
protected static Account account;
@@ -371,38 +372,6 @@ public void uploadFile(File file, String remotePath) {
371372
}
372373

373374
public void uploadOCUpload(OCUpload ocUpload) {
374-
ConnectivityService connectivityServiceMock = new ConnectivityService() {
375-
@Override
376-
public void addListener(@NonNull NetworkChangeListener listener) {
377-
378-
}
379-
380-
@Override
381-
public void removeListener(@NonNull NetworkChangeListener listener) {
382-
383-
}
384-
385-
@Override
386-
public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
387-
388-
}
389-
390-
@Override
391-
public boolean isConnected() {
392-
return false;
393-
}
394-
395-
@Override
396-
public boolean isInternetWalled() {
397-
return false;
398-
}
399-
400-
@Override
401-
public Connectivity getConnectivity() {
402-
return Connectivity.CONNECTED_WIFI;
403-
}
404-
};
405-
406375
PowerManagementService powerManagementServiceMock = new PowerManagementService() {
407376
@Override
408377
public boolean isIgnoringOptimization() {

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

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import com.nextcloud.client.device.BatteryStatus;
2020
import com.nextcloud.client.device.PowerManagementService;
2121
import com.nextcloud.client.jobs.upload.FileUploadWorker;
22-
import com.nextcloud.client.network.Connectivity;
23-
import com.nextcloud.client.network.ConnectivityService;
24-
import com.nextcloud.client.network.NetworkChangeListener;
2522
import com.owncloud.android.datamodel.OCFile;
2623
import com.owncloud.android.datamodel.UploadsStorageManager;
2724
import com.owncloud.android.db.OCUpload;
@@ -203,38 +200,6 @@ public void uploadOCUpload(OCUpload ocUpload) {
203200
}
204201

205202
public void uploadOCUpload(OCUpload ocUpload, int localBehaviour) {
206-
ConnectivityService connectivityServiceMock = new ConnectivityService() {
207-
@Override
208-
public void addListener(@NonNull NetworkChangeListener listener) {
209-
210-
}
211-
212-
@Override
213-
public void removeListener(@NonNull NetworkChangeListener listener) {
214-
215-
}
216-
217-
@Override
218-
public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
219-
callback.onComplete(true);
220-
}
221-
222-
@Override
223-
public boolean isConnected() {
224-
return true;
225-
}
226-
227-
@Override
228-
public boolean isInternetWalled() {
229-
return false;
230-
}
231-
232-
@Override
233-
public Connectivity getConnectivity() {
234-
return Connectivity.CONNECTED_WIFI;
235-
}
236-
};
237-
238203
PowerManagementService powerManagementServiceMock = new PowerManagementService() {
239204
@Override
240205
public boolean isIgnoringOptimization() {

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

Lines changed: 3 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
import com.nextcloud.client.device.BatteryStatus;
1313
import com.nextcloud.client.device.PowerManagementService;
1414
import com.nextcloud.client.jobs.upload.FileUploadWorker;
15-
import com.nextcloud.client.network.Connectivity;
15+
import com.nextcloud.client.network.ConnectivityManagerFactory;
1616
import com.nextcloud.client.network.ConnectivityService;
17-
import com.nextcloud.client.network.NetworkChangeListener;
1817
import com.owncloud.android.datamodel.OCFile;
1918
import com.owncloud.android.datamodel.UploadsStorageManager;
2019
import com.owncloud.android.db.OCUpload;
@@ -56,38 +55,6 @@ public class UploadIT extends AbstractOnServerIT {
5655
new UploadsStorageManager(UserAccountManagerImpl.fromContext(targetContext),
5756
targetContext.getContentResolver());
5857

59-
private ConnectivityService connectivityServiceMock = new ConnectivityService() {
60-
@Override
61-
public void addListener(@NonNull NetworkChangeListener listener) {
62-
63-
}
64-
65-
@Override
66-
public void removeListener(@NonNull NetworkChangeListener listener) {
67-
68-
}
69-
70-
@Override
71-
public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
72-
73-
}
74-
75-
@Override
76-
public boolean isConnected() {
77-
return false;
78-
}
79-
80-
@Override
81-
public boolean isInternetWalled() {
82-
return false;
83-
}
84-
85-
@Override
86-
public Connectivity getConnectivity() {
87-
return Connectivity.CONNECTED_WIFI;
88-
}
89-
};
90-
9158
private PowerManagementService powerManagementServiceMock = new PowerManagementService() {
9259
@Override
9360
public boolean isIgnoringOptimization() {
@@ -288,37 +255,7 @@ public BatteryStatus getBattery() {
288255

289256
@Test
290257
public void testUploadOnWifiOnlyButNoWifi() {
291-
ConnectivityService connectivityServiceMock = new ConnectivityService() {
292-
@Override
293-
public void addListener(@NonNull NetworkChangeListener listener) {
294-
295-
}
296-
297-
@Override
298-
public void removeListener(@NonNull NetworkChangeListener listener) {
299-
300-
}
301-
302-
@Override
303-
public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
304-
305-
}
306-
307-
@Override
308-
public boolean isConnected() {
309-
return false;
310-
}
311-
312-
@Override
313-
public boolean isInternetWalled() {
314-
return false;
315-
}
316-
317-
@Override
318-
public Connectivity getConnectivity() {
319-
return new Connectivity(true, false, false, true, false);
320-
}
321-
};
258+
ConnectivityService connectivityServiceMock = ConnectivityManagerFactory.INSTANCE.getWifi();
322259
OCUpload ocUpload = new OCUpload(FileStorageUtils.getTemporalPath(account.name) + "/empty.txt",
323260
FOLDER + "noWifi.txt", account.name);
324261
ocUpload.setUseWifiOnly(true);
@@ -387,37 +324,7 @@ public void testUploadOnWifiOnlyAndWifi() {
387324

388325
@Test
389326
public void testUploadOnWifiOnlyButMeteredWifi() {
390-
ConnectivityService connectivityServiceMock = new ConnectivityService() {
391-
@Override
392-
public void addListener(@NonNull NetworkChangeListener listener) {
393-
394-
}
395-
396-
@Override
397-
public void removeListener(@NonNull NetworkChangeListener listener) {
398-
399-
}
400-
401-
@Override
402-
public void isNetworkAndServerAvailable(@NonNull GenericCallback<Boolean> callback) {
403-
404-
}
405-
406-
@Override
407-
public boolean isConnected() {
408-
return false;
409-
}
410-
411-
@Override
412-
public boolean isInternetWalled() {
413-
return false;
414-
}
415-
416-
@Override
417-
public Connectivity getConnectivity() {
418-
return new Connectivity(true, true, true, true, false);
419-
}
420-
};
327+
ConnectivityService connectivityServiceMock = ConnectivityManagerFactory.INSTANCE.getMetered();
421328
OCUpload ocUpload = new OCUpload(FileStorageUtils.getTemporalPath(account.name) + "/empty.txt",
422329
FOLDER + "noWifi.txt",
423330
account.name);

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ import com.nextcloud.client.device.BatteryStatus
1414
import com.nextcloud.client.device.PowerManagementService
1515
import com.nextcloud.client.jobs.upload.FileUploadHelper
1616
import com.nextcloud.client.jobs.upload.FileUploadWorker
17-
import com.nextcloud.client.network.Connectivity
18-
import com.nextcloud.client.network.ConnectivityService
19-
import com.nextcloud.client.network.NetworkChangeListener
2017
import com.owncloud.android.AbstractOnServerIT
2118
import com.owncloud.android.datamodel.OCFile
2219
import com.owncloud.android.datamodel.UploadsStorageManager
@@ -34,15 +31,6 @@ import org.junit.Test
3431
abstract class FileUploaderIT : AbstractOnServerIT() {
3532
private var uploadsStorageManager: UploadsStorageManager? = null
3633

37-
private val connectivityServiceMock: ConnectivityService = object : ConnectivityService {
38-
override fun addListener(listener: NetworkChangeListener) = Unit
39-
override fun removeListener(listener: NetworkChangeListener) = Unit
40-
override fun isNetworkAndServerAvailable(callback: ConnectivityService.GenericCallback<Boolean>) = Unit
41-
override fun isConnected(): Boolean = false
42-
override fun isInternetWalled(): Boolean = false
43-
override fun getConnectivity(): Connectivity = Connectivity.CONNECTED_WIFI
44-
}
45-
4634
private val powerManagementServiceMock: PowerManagementService = object : PowerManagementService {
4735
override val isIgnoringOptimization: Boolean
4836
get() = true

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
2121
import androidx.test.espresso.matcher.ViewMatchers.isRoot
2222
import androidx.test.espresso.matcher.ViewMatchers.withId
2323
import androidx.test.espresso.matcher.ViewMatchers.withText
24-
import com.nextcloud.test.ConnectivityServiceOfflineMock
2524
import com.nextcloud.test.FileRemovedIdlingResource
2625
import com.nextcloud.test.LoopFailureHandler
2726
import com.owncloud.android.AbstractOnServerIT
@@ -164,7 +163,7 @@ class PreviewImageActivityIT : AbstractOnServerIT() {
164163
launchActivity<PreviewImageActivity>(intent).use { scenario ->
165164
if (offline) {
166165
scenario.onActivity { activity ->
167-
activity.connectivityService = ConnectivityServiceOfflineMock()
166+
activity.connectivityService = connectivityServiceMock
168167
}
169168
}
170169
onView(isRoot()).check(matches(isDisplayed()))

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
1414
import com.nextcloud.client.database.NextcloudDatabase
1515
import com.nextcloud.client.jobs.download.FileDownloadWorker
1616
import com.nextcloud.client.jobs.upload.FileUploadHelper
17-
import com.nextcloud.client.network.Connectivity
18-
import com.nextcloud.client.network.ConnectivityService
19-
import com.nextcloud.client.network.NetworkChangeListener
17+
import com.nextcloud.client.network.ConnectivityManagerFactory
2018
import com.nextcloud.utils.EditorUtils
2119
import com.owncloud.android.R
2220
import com.owncloud.android.databinding.TestLayoutBinding
@@ -43,14 +41,7 @@ class TestActivity :
4341
private lateinit var fileOperation: FileOperationsHelper
4442
private lateinit var binding: TestLayoutBinding
4543

46-
val connectivityServiceMock: ConnectivityService = object : ConnectivityService {
47-
override fun addListener(listener: NetworkChangeListener) = Unit
48-
override fun removeListener(listener: NetworkChangeListener) = Unit
49-
override fun isNetworkAndServerAvailable(callback: ConnectivityService.GenericCallback<Boolean>) = Unit
50-
override fun isConnected(): Boolean = false
51-
override fun isInternetWalled(): Boolean = false
52-
override fun getConnectivity(): Connectivity = Connectivity.CONNECTED_WIFI
53-
}
44+
val connectivityServiceMock = ConnectivityManagerFactory.mock
5445

5546
override fun onCreate(savedInstanceState: Bundle?) {
5647
super.onCreate(savedInstanceState)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class InternalTwoWaySyncWork(
4343
if (!appPreferences.isTwoWaySyncEnabled ||
4444
powerManagementService.isPowerSavingEnabled ||
4545
!connectivityService.isConnected ||
46-
connectivityService.isInternetWalled ||
46+
connectivityService.isInternetWalled() ||
4747
!connectivityService.connectivity.isWifi
4848
) {
4949
Log_OC.d(TAG, "Not starting due to constraints!")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class OfflineSyncWork(
139139
result?.data?.get(0) as? String
140140
}
141141

142-
else -> if (connectivityService.isInternetWalled) {
142+
else -> if (connectivityService.isInternetWalled()) {
143143
Log_OC.d(TAG, "No connectivity, skipping sync")
144144
null
145145
} else {

0 commit comments

Comments
 (0)