Merge pull request #6404 from nextcloud/removeFilesdrop

remove fileDrop capability

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -2022,8 +2022,6 @@ public class FileDataStorageManager {
                           capability.getFilesUndelete().getValue());
         contentValues.put(ProviderTableMeta.CAPABILITIES_FILES_VERSIONING,
                           capability.getFilesVersioning().getValue());
-        contentValues.put(ProviderTableMeta.CAPABILITIES_FILES_DROP,
-                          capability.getFilesFileDrop().getValue());
         contentValues.put(ProviderTableMeta.CAPABILITIES_EXTERNAL_LINKS,
                           capability.getExternalLinks().getValue());
         contentValues.put(ProviderTableMeta.CAPABILITIES_SERVER_NAME,
@@ -2158,7 +2156,6 @@ public class FileDataStorageManager {
                                                           ProviderTableMeta.CAPABILITIES_FILES_BIGFILECHUNKING));
             capability.setFilesUndelete(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_FILES_UNDELETE));
             capability.setFilesVersioning(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_FILES_VERSIONING));
-            capability.setFilesFileDrop(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_FILES_DROP));
             capability.setExternalLinks(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_EXTERNAL_LINKS));
             capability.setServerName(getString(cursor, ProviderTableMeta.CAPABILITIES_SERVER_NAME));
             capability.setServerColor(getString(cursor, ProviderTableMeta.CAPABILITIES_SERVER_COLOR));

src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -206,7 +206,6 @@ public class ProviderMeta {
         public static final String CAPABILITIES_FILES_BIGFILECHUNKING = "files_bigfilechunking";
         public static final String CAPABILITIES_FILES_UNDELETE = "files_undelete";
         public static final String CAPABILITIES_FILES_VERSIONING = "files_versioning";
-        public static final String CAPABILITIES_FILES_DROP = "files_drop";
         public static final String CAPABILITIES_EXTERNAL_LINKS = "external_links";
         public static final String CAPABILITIES_SERVER_NAME = "server_name";
         public static final String CAPABILITIES_SERVER_COLOR = "server_color";

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -778,7 +778,6 @@ public class FileContentProvider extends ContentProvider {
                        + ProviderTableMeta.CAPABILITIES_FILES_BIGFILECHUNKING + INTEGER   // boolean
                        + ProviderTableMeta.CAPABILITIES_FILES_UNDELETE + INTEGER  // boolean
                        + ProviderTableMeta.CAPABILITIES_FILES_VERSIONING + INTEGER   // boolean
-                       + ProviderTableMeta.CAPABILITIES_FILES_DROP + INTEGER  // boolean
                        + ProviderTableMeta.CAPABILITIES_EXTERNAL_LINKS + INTEGER  // boolean
                        + ProviderTableMeta.CAPABILITIES_SERVER_NAME + TEXT
                        + ProviderTableMeta.CAPABILITIES_SERVER_COLOR + TEXT

src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapter.java

@@ -423,11 +423,6 @@ public class ShareeListAdapter extends RecyclerView.Adapter<ShareeListAdapter.Us
                                      boolean canEditChange,
                                      boolean canEditDelete);
 
-        /**
-         * show a snackbar that this feature is not supported by ownCloud.
-         */
-        void showNotSupportedByOcMessage();
-
         /**
          * Starts a dialog that requests a password to the user to protect a share.
          *

src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -41,7 +41,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.google.android.material.snackbar.Snackbar;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
@@ -402,12 +401,7 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
                 return true;
             case R.id.action_hide_file_listing: {
                 item.setChecked(!item.isChecked());
-                if (capabilities.getFilesFileDrop().isTrue()) {
-                    fileOperationsHelper.setHideFileListingPermissionsToPublicShare(publicShare, item.isChecked());
-                } else {
-                    // not supported in ownCloud
-                    showNotSupportedByOcMessage();
-                }
+                fileOperationsHelper.setHideFileListingPermissionsToPublicShare(publicShare, item.isChecked());
                 return true;
             }
             case R.id.action_hide_file_download:
@@ -455,16 +449,6 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
         }
     }
 
-    @Override
-    public void showNotSupportedByOcMessage() {
-        if (getView() != null) {
-            Snackbar.make(getView(), R.string.files_drop_not_supported, Snackbar.LENGTH_LONG)
-                .setAction(R.string.learn_more, v ->
-                    DisplayUtils.startLinkIntent(requireActivity(), R.string.url_server_install))
-                    .show();
-        }
-    }
-
     /**
      * Updates the UI after the result of an update operation on the edited {@link OCFile}.
      *

src/main/res/values/strings.xml

@@ -508,8 +508,6 @@
 
     <string name="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
     <string name="actionbar_search">Search</string>
-    <string name="files_drop_not_supported">This is a Nextcloud feature, please upgrade.</string>
-    <string name="learn_more">Learn more</string>
     <string name="drawer_synced_folders">Auto upload</string>
     <string name="drawer_community">Community</string>
     <string name="community_testing_headline">Help by testing</string>