Skip to content

Commit 5510d5a

Browse files
committed
fix togglePermission
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 9af005d commit 5510d5a

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,8 @@ class FileDetailsSharingProcessFragment :
516516
}
517517
}
518518

519-
private fun togglePermission(permissionFlag: Int) {
520-
permission = sharePermissionManager.togglePermission(permission, permissionFlag)
519+
private fun togglePermission(isChecked: Boolean, permissionFlag: Int) {
520+
permission = sharePermissionManager.togglePermission(isChecked, permission, permissionFlag)
521521
}
522522

523523
private fun setCheckboxStates() {
@@ -556,23 +556,23 @@ class FileDetailsSharingProcessFragment :
556556
private fun setCheckboxesListeners() {
557557
binding.run {
558558
shareReadCheckbox.setOnCheckedChangeListener { _, isChecked ->
559-
togglePermission(OCShare.READ_PERMISSION_FLAG)
559+
togglePermission(isChecked, OCShare.READ_PERMISSION_FLAG)
560560
}
561561

562562
shareCreateCheckbox.setOnCheckedChangeListener { _, isChecked ->
563-
togglePermission(OCShare.CREATE_PERMISSION_FLAG)
563+
togglePermission(isChecked, OCShare.CREATE_PERMISSION_FLAG)
564564
}
565565

566566
shareEditCheckbox.setOnCheckedChangeListener { _, isChecked ->
567-
togglePermission(OCShare.UPDATE_PERMISSION_FLAG)
567+
togglePermission(isChecked, OCShare.UPDATE_PERMISSION_FLAG)
568568
}
569569

570570
shareCheckbox.setOnCheckedChangeListener { _, isChecked ->
571-
togglePermission(OCShare.SHARE_PERMISSION_FLAG)
571+
togglePermission(isChecked, OCShare.SHARE_PERMISSION_FLAG)
572572
}
573573

574574
shareDeleteCheckbox.setOnCheckedChangeListener { _, isChecked ->
575-
togglePermission(OCShare.DELETE_PERMISSION_FLAG)
575+
togglePermission(isChecked, OCShare.DELETE_PERMISSION_FLAG)
576576
}
577577
}
578578
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ import com.owncloud.android.ui.fragment.FileDetailsSharingProcessFragment.Compan
1313

1414
class SharePermissionManager {
1515

16-
fun togglePermission(permission: Int, permissionFlag: Int): Int {
16+
fun togglePermission(isChecked: Boolean, permission: Int, permissionFlag: Int): Int {
1717
Log_OC.d(TAG, "togglePermission before: $permission")
1818

1919
if (!isPermissionValid(permission)) {
2020
Log_OC.d(TAG, "permission is not valid, togglePermission cancelled")
2121
return permission
2222
}
2323

24-
val result = if (hasPermission(permission, permissionFlag)) {
25-
permission and permissionFlag.inv()
26-
} else {
24+
val result = if (isChecked) {
2725
permission or permissionFlag
26+
} else {
27+
permission and permissionFlag.inv()
2828
}
2929

3030
Log_OC.d(TAG, "togglePermission after: $result")

0 commit comments

Comments
 (0)