add custom permissions to bottom sheet

Signed-off-by: alperozturk <alper_ozturk@proton.me>

Author: alperozturk96

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

@@ -692,8 +692,8 @@ public void onQuickPermissionChanged(OCShare share, int permission) {
     }
 
     @Override
-    public void openShareDetails(OCShare share) {
-        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_CUSTOM_PERMISSION);
+    public void openShareDetail(OCShare share) {
+        modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
     }
 
     //launcher for contact permission

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt

@@ -71,8 +71,6 @@ class FileDetailsSharingProcessFragment :
         // types of screens to be displayed
         const val SCREEN_TYPE_PERMISSION = 1 // permissions screen
         const val SCREEN_TYPE_NOTE = 2 // note screen
-        const val SCREEN_TYPE_CUSTOM_PERMISSION = 3 // custom permissions screen
-
 
         /**
          * fragment instance to be called while creating new share for internal and external share
@@ -189,11 +187,7 @@ class FileDetailsSharingProcessFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        if (shareProcessStep == SCREEN_TYPE_PERMISSION || shareProcessStep == SCREEN_TYPE_CUSTOM_PERMISSION) {
-            if (shareProcessStep == SCREEN_TYPE_CUSTOM_PERMISSION) {
-                binding.customPermissionRadioButton.isChecked = true
-            }
-
+        if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
             showShareProcessFirst()
         } else {
             showShareProcessSecond()
@@ -295,16 +289,18 @@ class FileDetailsSharingProcessFragment :
         if (share?.isFolder == true) updateViewForFolder() else updateViewForFile()
 
         // custom permissions / read only / allow upload and editing / file drop
-        if (sharePermissionManager.isCustomPermission(share)) {
-            binding.customPermissionRadioButton.isChecked = true
-            binding.customPermissionLayout.setVisibilityWithAnimation(true)
-        } else if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
-            binding.editingRadioButton.isChecked = true
-        } else if (SharingMenuHelper.isFileDrop(share) && share?.isFolder == true) {
-            binding.fileDropRadioButton.isChecked = true
-        } else if (SharingMenuHelper.isReadOnly(share)) {
-            binding.viewOnlyRadioButton.isChecked = true
-        } // TODO:
+        binding.run {
+            if (sharePermissionManager.isCustomPermission(share)) {
+                customPermissionRadioButton.isChecked = true
+                customPermissionLayout.setVisibilityWithAnimation(true)
+            } else if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
+                editingRadioButton.isChecked = true
+            } else if (SharingMenuHelper.isFileDrop(share) && share?.isFolder == true) {
+                fileDropRadioButton.isChecked = true
+            } else if (SharingMenuHelper.isReadOnly(share)) {
+                viewOnlyRadioButton.isChecked = true
+            }
+        }
 
         shareType = share?.shareType ?: ShareType.NO_SHARED
 

app/src/main/java/com/owncloud/android/ui/fragment/QuickSharingPermissionsBottomSheetDialog.java

@@ -32,12 +32,9 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import static com.owncloud.android.lib.resources.shares.OCShare.CREATE_PERMISSION_FLAG;
-import static com.owncloud.android.lib.resources.shares.OCShare.DELETE_PERMISSION_FLAG;
 import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FILE;
 import static com.owncloud.android.lib.resources.shares.OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER;
 import static com.owncloud.android.lib.resources.shares.OCShare.READ_PERMISSION_FLAG;
-import static com.owncloud.android.lib.resources.shares.OCShare.SHARE_PERMISSION_FLAG;
-import static com.owncloud.android.lib.resources.shares.OCShare.UPDATE_PERMISSION_FLAG;
 
 /**
  * File Details Quick Sharing permissions options {@link Dialog} styled as a bottom sheet for main actions.
@@ -119,7 +116,7 @@ private void handlePermissionChanged(List<QuickPermissionModel> quickPermissionM
             permissionFlag = CREATE_PERMISSION_FLAG + READ_PERMISSION_FLAG;
         } else if (permissionName.equalsIgnoreCase(res.getString(R.string.share_custom_permission))) {
             dismiss();
-            actions.openShareDetails(ocShare);
+            actions.openShareDetail(ocShare);
             return;
         }
 
@@ -155,6 +152,6 @@ protected void onStop() {
 
     public interface QuickPermissionSharingBottomSheetActions {
         void onQuickPermissionChanged(OCShare share, int permission);
-        void openShareDetails(OCShare share);
+        void openShareDetail(OCShare share);
     }
 }