Bugfix Check Network Connection When File Item Clicked

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

@@ -0,0 +1,44 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Alper Ozturk
+ * Copyright (C) 2023 Alper Ozturk
+ * Copyright (C) 2023 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.nextcloud.client.network
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+
+object ConnectivityObserver {
+
+    fun isConnected(context: Context): Boolean {
+        val connectivityManager: ConnectivityManager =
+            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val nw = connectivityManager.activeNetwork
+        val actNw = connectivityManager.getNetworkCapabilities(nw) ?: return false
+
+        return when {
+            actNw.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
+            actNw.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
+            actNw.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
+            actNw.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
+            else -> false
+        }
+    }
+}

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

@@ -44,6 +44,7 @@
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.jobs.BackgroundJobManager;
+import com.nextcloud.client.network.ConnectivityObserver;
 import com.nextcloud.client.network.ConnectivityService;
 import com.nextcloud.utils.EditorUtils;
 import com.owncloud.android.MainApp;
@@ -240,6 +241,12 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
+    public void checkInternetConnection() {
+        if (ConnectivityObserver.INSTANCE.isConnected(this)) {
+            hideInfoBox();
+        }
+    }
+
     @Override
     protected void onStart() {
         super.onStart();

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

@@ -219,7 +219,6 @@ protected final void showInfoBox(@StringRes int text) {
     /**
      * 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 void uploadFiles() {
             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 boolean onLongItemClicked(OCFile file) {
 
     @Override
     public void onItemClicked(OCFile file) {
+        ((FileActivity) mContainerActivity).checkInternetConnection();
+
         if (getCommonAdapter().isMultiSelect()) {
             toggleItemToCheckedList(file);
         } else {