Skip to content

Commit 5eae6b1

Browse files
committed
fix order
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent a85e65a commit 5eae6b1

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,15 +290,15 @@ class FileDetailsSharingProcessFragment :
290290

291291
// custom permissions / read only / allow upload and editing / file drop
292292
binding.run {
293-
if (sharePermissionManager.isCustomPermission(share)) {
294-
customPermissionRadioButton.isChecked = true
295-
customPermissionLayout.setVisibilityWithAnimation(true)
296-
} else if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
293+
if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
297294
editingRadioButton.isChecked = true
298295
} else if (SharingMenuHelper.isFileDrop(share) && share?.isFolder == true) {
299296
fileDropRadioButton.isChecked = true
300297
} else if (SharingMenuHelper.isReadOnly(share)) {
301298
viewOnlyRadioButton.isChecked = true
299+
} else if (sharePermissionManager.isCustomPermission(share)) {
300+
customPermissionRadioButton.isChecked = true
301+
customPermissionLayout.setVisibilityWithAnimation(true)
302302
}
303303
}
304304

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,16 @@ public static boolean isSecureFileDrop(OCShare share) {
7171
public static String getPermissionName(Context context, OCShare share) {
7272
final var res = context.getResources();
7373

74-
if (sharePermissionManager.isCustomPermission(share)) {
75-
return res.getString(R.string.share_custom_permission);
76-
} else if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
74+
if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
7775
return res.getString(R.string.share_permission_can_edit);
7876
} else if (SharingMenuHelper.isReadOnly(share)) {
7977
return res.getString(R.string.share_permission_view_only);
8078
} else if (SharingMenuHelper.isSecureFileDrop(share)) {
8179
return res.getString(R.string.share_permission_secure_file_drop);
8280
} else if (SharingMenuHelper.isFileDrop(share)) {
8381
return res.getString(R.string.share_permission_file_drop);
82+
} else if (sharePermissionManager.isCustomPermission(share)) {
83+
return res.getString(R.string.share_custom_permission);
8484
}
8585

8686
return null;
@@ -93,14 +93,14 @@ public static String getPermissionName(Context context, OCShare share) {
9393
public static int getPermissionCheckedItem(Context context, OCShare share, String[] permissionArray) {
9494
int permissionName;
9595

96-
if (sharePermissionManager.isCustomPermission(share)) {
97-
permissionName = R.string.share_custom_permission;
98-
} else if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
96+
if (SharingMenuHelper.isUploadAndEditingAllowed(share)) {
9997
permissionName = share.isFolder() ? R.string.link_share_allow_upload_and_editing : R.string.link_share_editing;
10098
} else if (SharingMenuHelper.isReadOnly(share)) {
10199
permissionName = R.string.link_share_view_only;
102100
} else if (SharingMenuHelper.isFileDrop(share)) {
103101
permissionName = R.string.link_share_file_drop;
102+
} else if (sharePermissionManager.isCustomPermission(share)) {
103+
permissionName = R.string.share_custom_permission;
104104
} else {
105105
return 0;
106106
}

0 commit comments

Comments
 (0)