Skip to content

Commit ec67099

Browse files
committed
fix onCustomPermissionSelected
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 49e54bb commit ec67099

2 files changed

Lines changed: 16 additions & 6 deletions

File tree

app/src/main/java/com/owncloud/android/ui/adapter/QuickSharingPermissionsAdapter.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import android.view.ViewGroup
1616
import androidx.recyclerview.widget.RecyclerView
1717
import com.nextcloud.android.common.ui.theme.utils.ColorRole
1818
import com.nextcloud.utils.extensions.setVisibleIf
19+
import com.owncloud.android.R
1920
import com.owncloud.android.databinding.ItemQuickSharePermissionsBinding
2021
import com.owncloud.android.datamodel.QuickPermissionModel
2122
import com.owncloud.android.utils.theme.ViewThemeUtils
@@ -57,9 +58,15 @@ class QuickSharingPermissionsAdapter(
5758
}
5859
}
5960

61+
val customPermissionName = itemView.context.getString(R.string.share_custom_permission)
62+
val permissionName = quickPermissionModel.permissionName
63+
val isCustomPermission = permissionName.equals(customPermissionName, ignoreCase = true)
64+
6065
itemView.setOnClickListener {
61-
// if user select different options then only update the permission
62-
if (!quickPermissionModel.isSelected) {
66+
if (isCustomPermission) {
67+
onPermissionChangeListener.onCustomPermissionSelected()
68+
} else if (!quickPermissionModel.isSelected) {
69+
// if user select different options then only update the permission
6370
onPermissionChangeListener.onPermissionChanged(absoluteAdapterPosition)
6471
} else {
6572
// dismiss sheet on selection of same permission
@@ -70,6 +77,7 @@ class QuickSharingPermissionsAdapter(
7077

7178
interface OnPermissionChangeListener {
7279
fun onPermissionChanged(position: Int)
80+
fun onCustomPermissionSelected()
7381
fun onDismissSheet()
7482
}
7583
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ private void setUpRecyclerView() {
8181
QuickSharingPermissionsAdapter adapter = new QuickSharingPermissionsAdapter(
8282
quickPermissionModelList,
8383
new QuickSharingPermissionsAdapter.QuickSharingPermissionViewHolder.OnPermissionChangeListener() {
84+
@Override
85+
public void onCustomPermissionSelected() {
86+
dismiss();
87+
actions.openShareDetail(ocShare);
88+
}
89+
8490
@Override
8591
public void onPermissionChanged(int position) {
8692
handlePermissionChanged(quickPermissionModelList, position);
@@ -114,10 +120,6 @@ private void handlePermissionChanged(List<QuickPermissionModel> quickPermissionM
114120
permissionFlag = READ_PERMISSION_FLAG;
115121
} else if (permissionName.equalsIgnoreCase(res.getString(R.string.link_share_file_drop))) {
116122
permissionFlag = CREATE_PERMISSION_FLAG + READ_PERMISSION_FLAG;
117-
} else if (permissionName.equalsIgnoreCase(res.getString(R.string.share_custom_permission))) {
118-
dismiss();
119-
actions.openShareDetail(ocShare);
120-
return;
121123
}
122124

123125
actions.onQuickPermissionChanged(ocShare, permissionFlag);

0 commit comments

Comments
 (0)