Эх сурвалжийг харах

Merge pull request #10323 from nextcloud/disableSharingOnE2E

Disable sharing on e2e
Álvaro Brey 2 жил өмнө
parent
commit
f19e3b7f33

+ 5 - 1
app/src/main/java/com/owncloud/android/ui/adapter/FileDetailTabAdapter.java

@@ -70,6 +70,10 @@ public class FileDetailTabAdapter extends FragmentStatePagerAdapter {
 
     @Override
     public int getCount() {
-        return 2;
+        if (file.isEncrypted()) {
+            return 1; // sharing not allowed for encrypted files, thus only show first tab (activities)
+        } else {
+            return 2; // show activities and sharing tab
+        }
     }
 }

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt

@@ -129,7 +129,7 @@ class OCFileListDelegate(
         bindGridMetadataViews(file, gridViewHolder)
 
         // shares
-        val shouldHideShare = gridView || hideItemOptions || file.isFolder && !file.canReshare() ||
+        val shouldHideShare = gridView || hideItemOptions || file.isFolder && !file.canReshare() || file.isEncrypted ||
             searchType == SearchType.FAVORITE_SEARCH
         if (shouldHideShare) {
             gridViewHolder.shared.visibility = View.GONE

+ 4 - 2
app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -250,10 +250,12 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
         binding.tabLayout.removeAllTabs();
 
         binding.tabLayout.addTab(binding.tabLayout.newTab().setText(R.string.drawer_item_activities).setIcon(R.drawable.ic_activity));
-        binding.tabLayout.addTab(binding.tabLayout.newTab().setText(R.string.share_dialog_title).setIcon(R.drawable.shared_via_users));
-
         themeLayoutUtils.colorTabLayout(getContext().getApplicationContext(), binding.tabLayout);
 
+        if (!getFile().isEncrypted()) {
+            binding.tabLayout.addTab(binding.tabLayout.newTab().setText(R.string.share_dialog_title).setIcon(R.drawable.shared_via_users));
+        }
+
         final FileDetailTabAdapter adapter = new FileDetailTabAdapter(getFragmentManager(), getFile(), user);
         binding.pager.setAdapter(adapter);
         binding.pager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(binding.tabLayout) {

+ 1 - 1
scripts/uploadReport.sh

@@ -54,7 +54,7 @@ fi
 if [ -e $FOLDER ]; then
     upload $FOLDER
 else
-    deleteOldComments
+    scripts/deleteOldComments.sh "$BRANCH" "$TYPE" "$PR"
     echo "$BRANCH_TYPE test failed, but no output was generated. Maybe a preliminary stage failed."
 
     curl_gh > /dev/null 2>&1  \