Merge pull request #12093 from nextcloud/bugfix/Despite-connection-is-restored-message-about-unreachable-server-still-present-9652182

Bugfix Check Network Connection When File Item Clicked

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

@@ -349,6 +349,11 @@ public abstract class AbstractIT {
 
     public void uploadOCUpload(OCUpload ocUpload) {
         ConnectivityService connectivityServiceMock = new ConnectivityService() {
+            @Override
+            public boolean isConnected() {
+                return false;
+            }
+
             @Override
             public boolean isInternetWalled() {
                 return false;

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

@@ -185,6 +185,11 @@ public abstract class AbstractOnServerIT extends AbstractIT {
 
     public void uploadOCUpload(OCUpload ocUpload, int localBehaviour) {
         ConnectivityService connectivityServiceMock = new ConnectivityService() {
+            @Override
+            public boolean isConnected() {
+                return false;
+            }
+
             @Override
             public boolean isInternetWalled() {
                 return false;

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

@@ -70,6 +70,11 @@ public class UploadIT extends AbstractOnServerIT {
                                   targetContext.getContentResolver());
 
     private ConnectivityService connectivityServiceMock = new ConnectivityService() {
+        @Override
+        public boolean isConnected() {
+            return false;
+        }
+
         @Override
         public boolean isInternetWalled() {
             return false;
@@ -283,6 +288,11 @@ public class UploadIT extends AbstractOnServerIT {
     @Test
     public void testUploadOnWifiOnlyButNoWifi() {
         ConnectivityService connectivityServiceMock = new ConnectivityService() {
+            @Override
+            public boolean isConnected() {
+                return false;
+            }
+
             @Override
             public boolean isInternetWalled() {
                 return false;
@@ -362,6 +372,11 @@ public class UploadIT extends AbstractOnServerIT {
     @Test
     public void testUploadOnWifiOnlyButMeteredWifi() {
         ConnectivityService connectivityServiceMock = new ConnectivityService() {
+            @Override
+            public boolean isConnected() {
+                return false;
+            }
+
             @Override
             public boolean isInternetWalled() {
                 return false;

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

@@ -43,9 +43,13 @@ import org.junit.Before
 import org.junit.Test
 
 abstract class FileUploaderIT : AbstractOnServerIT() {
-    var uploadsStorageManager: UploadsStorageManager? = null
+    private var uploadsStorageManager: UploadsStorageManager? = null
+
+    private val connectivityServiceMock: ConnectivityService = object : ConnectivityService {
+        override fun isConnected(): Boolean {
+            return false
+        }
 
-    val connectivityServiceMock: ConnectivityService = object : ConnectivityService {
         override fun isInternetWalled(): Boolean = false
         override fun getConnectivity(): Connectivity = Connectivity.CONNECTED_WIFI
     }

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

@@ -56,6 +56,10 @@ class TestActivity :
     private lateinit var binding: TestLayoutBinding
 
     val connectivityServiceMock: ConnectivityService = object : ConnectivityService {
+        override fun isConnected(): Boolean {
+            return false
+        }
+
         override fun isInternetWalled(): Boolean {
             return false
         }

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

@@ -25,6 +25,7 @@ package com.nextcloud.client.network;
  * and server reachability.
  */
 public interface ConnectivityService {
+    boolean isConnected();
 
     /**
      * Check if server is accessible by issuing HTTP status check request.

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

@@ -47,7 +47,6 @@ class ConnectivityServiceImpl implements ConnectivityService {
     private final GetRequestBuilder requestBuilder;
     private final WalledCheckCache walledCheckCache;
 
-
     static class GetRequestBuilder implements Function1<String, GetMethod> {
         @Override
         public GetMethod invoke(String url) {
@@ -67,6 +66,21 @@ class ConnectivityServiceImpl implements ConnectivityService {
         this.walledCheckCache = walledCheckCache;
     }
 
+    @Override
+    public boolean isConnected() {
+        Network nw = platformConnectivityManager.getActiveNetwork();
+        NetworkCapabilities actNw = platformConnectivityManager.getNetworkCapabilities(nw);
+
+        if (actNw == null) {
+            return false;
+        }
+
+        return actNw.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
+            actNw.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
+            actNw.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) ||
+            actNw.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH);
+    }
+
     @Override
     public boolean isInternetWalled() {
         final Boolean cachedValue = walledCheckCache.getValue();

app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java

@@ -242,6 +242,12 @@ public abstract class FileActivity extends DrawerActivity
         }
     }
 
+    public void checkInternetConnection() {
+        if (connectivityService.isConnected()) {
+            hideInfoBox();
+        }
+    }
+
     @Override
     protected void onStart() {
         super.onStart();

app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

@@ -219,7 +219,6 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable
     /**
      * Hides the toolbar's info box.
      */
-    @VisibleForTesting
     public final void hideInfoBox() {
         mInfoBox.setVisibility(View.GONE);
     }

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -561,8 +561,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
             getActivity(),
             ((FileActivity) getActivity()).getUser().orElseThrow(RuntimeException::new),
             FileDisplayActivity.REQUEST_CODE__SELECT_FILES_FROM_FILE_SYSTEM,
-                                                        getCurrentFile().isEncrypted()
-                                                        );
+            getCurrentFile().isEncrypted());
     }
 
     @Override
@@ -976,6 +975,8 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     @Override
     public void onItemClicked(OCFile file) {
+        ((FileActivity) mContainerActivity).checkInternetConnection();
+
         if (getCommonAdapter().isMultiSelect()) {
             toggleItemToCheckedList(file);
         } else {