Add rename support for file itself

nextcloud · Sep 2, 2024 · a17d0a1 · a17d0a1
1 parent 617dd6e
commit a17d0a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
@@ -165,8 +165,7 @@ public abstract class FileActivity extends DrawerActivity
     @Inject
     UserAccountManager accountManager;
 
-    @Inject
-    ConnectivityService connectivityService;
+    @Inject public ConnectivityService connectivityService;
 
     @Inject
     BackgroundJobManager backgroundJobManager;

diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
@@ -7,6 +7,8 @@
 package com.owncloud.android.ui.fragment;
 
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -212,18 +214,26 @@ private void setupClickListener() {
     }
 
     private void filterActionsForOfflineOperations() {
-        if (!file.isOfflineOperation() || file.isRootDirectory()) {
-            return;
-        }
+        // TODO add callback for isNetworkAndServerAvailable
+        new Thread(() -> {
+            boolean isNetworkAndServerAvailable = fileActivity.connectivityService.isNetworkAndServerAvailable();
+            new Handler(Looper.getMainLooper()).post(() -> {
+                if (file.isRootDirectory()) {
+                    return;
+                }
 
-        binding.menuCreateRichWorkspace.setVisibility(View.GONE);
-        binding.menuUploadFromApp.setVisibility(View.GONE);
-        binding.menuDirectCameraUpload.setVisibility(View.GONE);
-        binding.menuScanDocUpload.setVisibility(View.GONE);
-        binding.menuNewDocument.setVisibility(View.GONE);
-        binding.menuNewSpreadsheet.setVisibility(View.GONE);
-        binding.menuNewPresentation.setVisibility(View.GONE);
-        binding.creatorsContainer.setVisibility(View.GONE);
+                if (!isNetworkAndServerAvailable || file.isOfflineOperation()) {
+                    binding.menuCreateRichWorkspace.setVisibility(View.GONE);
+                    binding.menuUploadFromApp.setVisibility(View.GONE);
+                    binding.menuDirectCameraUpload.setVisibility(View.GONE);
+                    binding.menuScanDocUpload.setVisibility(View.GONE);
+                    binding.menuNewDocument.setVisibility(View.GONE);
+                    binding.menuNewSpreadsheet.setVisibility(View.GONE);
+                    binding.menuNewPresentation.setVisibility(View.GONE);
+                    binding.creatorsContainer.setVisibility(View.GONE);
+                }
+            });
+        }).start();
     }
 
     @Override