Skip to content

Commit 0f0d8e3

Browse files
committed
remove unexisting share types
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 06a63ba commit 0f0d8e3

File tree

5 files changed

+8
-32
lines changed

5 files changed

+8
-32
lines changed

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import it.niedermann.owncloud.notes.shared.util.DisplayUtils
3434
import it.niedermann.owncloud.notes.shared.util.clipboard.ClipboardUtil
3535
import it.niedermann.owncloud.notes.shared.util.extensions.getParcelableArgument
3636
import it.niedermann.owncloud.notes.shared.util.extensions.getSerializableArgument
37-
import it.niedermann.owncloud.notes.shared.util.extensions.toExpirationDateString
3837
import it.niedermann.owncloud.notes.util.DateUtil
3938
import kotlinx.coroutines.Dispatchers
4039
import kotlinx.coroutines.launch

app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void onDismissSheet() {
9393
*/
9494
private void handlePermissionChanged(List<QuickPermission> quickPermissionList, int position) {
9595
final var type = quickPermissionList.get(position).getType();
96-
int permissionFlag = type.getPermissionFlag(false);
96+
int permissionFlag = type.getPermissionFlag();
9797
actions.onQuickPermissionChanged(ocShare, permissionFlag);
9898
dismiss();
9999
}
@@ -103,7 +103,7 @@ private void handlePermissionChanged(List<QuickPermission> quickPermissionList,
103103
*/
104104
private List<QuickPermission> getQuickPermissionList() {
105105
final var selectedType = SharePermissionManager.INSTANCE.getSelectedType(ocShare);
106-
return selectedType.getAvailablePermissions(false);
106+
return selectedType.getAvailablePermissions();
107107
}
108108

109109
@Override

app/src/main/java/it/niedermann/owncloud/notes/share/model/QuickPermissionType.kt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,22 @@ import it.niedermann.owncloud.notes.R
1515
enum class QuickPermissionType(val iconId: Int, val textId: Int) {
1616
NONE(R.drawable.ic_unknown, R.string.share_permission_unknown),
1717
VIEW_ONLY(R.drawable.ic_eye, R.string.share_permission_view_only),
18-
CAN_EDIT(R.drawable.ic_edit, R.string.share_permission_can_edit),
19-
FILE_REQUEST(R.drawable.ic_file_request, R.string.share_permission_file_request),
20-
SECURE_FILE_DROP(R.drawable.ic_file_request, R.string.share_permission_secure_file_drop);
18+
CAN_EDIT(R.drawable.ic_edit, R.string.share_permission_can_edit);
2119

2220
fun getText(context: Context): String = context.getString(textId)
2321

2422
fun getIcon(context: Context): Drawable? = ContextCompat.getDrawable(context, iconId)
2523

26-
fun getPermissionFlag(isFolder: Boolean): Int = when (this) {
24+
fun getPermissionFlag(): Int = when (this) {
2725
NONE -> OCShare.NO_PERMISSION
2826
VIEW_ONLY -> OCShare.READ_PERMISSION_FLAG
29-
CAN_EDIT -> if (isFolder) OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER else OCShare.MAXIMUM_PERMISSIONS_FOR_FILE
30-
FILE_REQUEST -> OCShare.CREATE_PERMISSION_FLAG
31-
SECURE_FILE_DROP -> OCShare.CREATE_PERMISSION_FLAG + OCShare.READ_PERMISSION_FLAG
27+
CAN_EDIT -> OCShare.MAXIMUM_PERMISSIONS_FOR_FILE
3228
}
3329

34-
fun getAvailablePermissions(hasFileRequestPermission: Boolean): List<QuickPermission> {
35-
val permissions = listOf(VIEW_ONLY, CAN_EDIT, FILE_REQUEST)
36-
val result = if (hasFileRequestPermission) permissions else permissions.filter { it != FILE_REQUEST }
30+
fun getAvailablePermissions(): List<QuickPermission> {
31+
val permissions = listOf(VIEW_ONLY, CAN_EDIT)
3732

38-
return result.map { type ->
33+
return permissions.map { type ->
3934
QuickPermission(
4035
type = type,
4136
isSelected = (type == this)

app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ import it.niedermann.owncloud.notes.shared.model.OcsResponse
3232
import it.niedermann.owncloud.notes.shared.util.StringConstants
3333
import it.niedermann.owncloud.notes.shared.util.extensions.getErrorMessage
3434
import it.niedermann.owncloud.notes.shared.util.extensions.toExpirationDateLong
35-
import it.niedermann.owncloud.notes.shared.util.extensions.toExpirationDateString
3635
import org.json.JSONObject
37-
import java.util.Date
3836

3937
class ShareRepository(private val applicationContext: Context, private val account: SingleSignOnAccount) {
4038

app/src/main/res/drawable/ic_file_request.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)