Merge pull request #14398 from nextcloud/backport/14396/stable-3.30

[stable-3.30] GPLAY: do not show our custom uploader, due to lack of permission
nextcloud · Jan 14, 2025 · 3f3a90f · 3f3a90f
2 parents 9075b63 + 99da248
commit 3f3a90f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/...gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testBottomSheet.png b/...gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testBottomSheet.png
diff --git a/app/src/main/java/com/nextcloud/utils/BuildHelper.kt b/app/src/main/java/com/nextcloud/utils/BuildHelper.kt
@@ -6,6 +6,10 @@
  */
 package com.nextcloud.utils
 
+import com.owncloud.android.BuildConfig
+
 object BuildHelper {
     const val GPLAY: String = "gplay"
+
+    fun isFlavourGPlay(): Boolean = GPLAY == BuildConfig.FLAVOR
 }
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
@@ -16,6 +16,7 @@
 import com.nextcloud.client.device.DeviceInfo;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.documentscan.AppScanOptionalFeature;
+import com.nextcloud.utils.BuildHelper;
 import com.nextcloud.utils.EditorUtils;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.FileListActionsBottomSheetCreatorBinding;
@@ -156,6 +157,11 @@ protected void onCreate(Bundle savedInstanceState) {
             binding.menuCreateRichWorkspaceDivider.setVisibility(View.GONE);
         }
 
+        if (BuildHelper.INSTANCE.isFlavourGPlay()) {
+            binding.menuUploadFiles.setVisibility(View.GONE);
+            binding.uploadContentFromOtherApps.setText(getContext().getString(R.string.upload_files));
+        }
+
         setupClickListener();
     }
 

diff --git a/app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml b/app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
@@ -94,6 +94,7 @@
                     app:tint="@color/primary" />
 
                 <TextView
+                    android:id="@+id/upload_content_from_other_apps"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"