Преглед на файлове

Merge pull request #11948 from nextcloud/hideSecureShare

if e2e server app is disabled, do not show secure file drop
Andy Scherzinger преди 1 година
родител
ревизия
79aceb8990
променени са 1 файла, в които са добавени 2 реда и са изтрити 15 реда
  1. 2 15
      app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

+ 2 - 15
app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -445,21 +445,8 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
                                                                                    ShareType.PUBLIC_LINK,
                                                                                    "");
 
-//
-//        boolean supportsSecureFiledrop = file.isEncrypted() &&
-//            capabilities.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_26);
-//
-//        if (publicShares.isEmpty() &&
-//            containsNoNewPublicShare(adapter.getShares()) &&
-//            (!file.isEncrypted() || supportsSecureFiledrop)) {
-//            final OCShare ocShare = new OCShare();
-//            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-//            publicShares.add(ocShare);
-//        } else {
-//            adapter.removeNewPublicShare();
-//        }
-
-        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares())) {
+        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares()) &&
+            (!file.isEncrypted() || capabilities.getEndToEndEncryption().isTrue())) {
             final OCShare ocShare = new OCShare();
             ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
             publicShares.add(ocShare);