Skip to content

Commit 3fcc813

Browse files
committed
fix allow re-share logic
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 6eae614 commit 3fcc813

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

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

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import com.owncloud.android.R
2727
import com.owncloud.android.databinding.FileDetailsSharingProcessFragmentBinding
2828
import com.owncloud.android.datamodel.OCFile
2929
import com.owncloud.android.lib.resources.shares.OCShare
30-
import com.owncloud.android.lib.resources.shares.SharePermissionsBuilder
3130
import com.owncloud.android.lib.resources.shares.ShareType
3231
import com.owncloud.android.lib.resources.status.OCCapability
3332
import com.owncloud.android.ui.activity.FileActivity
@@ -175,7 +174,7 @@ class FileDetailsSharingProcessFragment :
175174

176175
fileActivity = activity as FileActivity?
177176
capabilities = CapabilityUtils.getCapability(context)
178-
permission = getMaximumPermission()
177+
permission = sharePermissionManager.getMaximumPermission(isFolder())
179178

180179
requireNotNull(fileActivity) { "FileActivity may not be null" }
181180
}
@@ -201,14 +200,6 @@ class FileDetailsSharingProcessFragment :
201200

202201
private fun isFolder(): Boolean = file?.isFolder == true || share?.isFolder == true
203202

204-
private fun getMaximumPermission(): Int {
205-
return if (isFolder()) {
206-
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER
207-
} else {
208-
OCShare.MAXIMUM_PERMISSIONS_FOR_FILE
209-
}
210-
}
211-
212203
private fun themeView() {
213204
viewThemeUtils.platform.run {
214205
binding.run {
@@ -510,7 +501,7 @@ class FileDetailsSharingProcessFragment :
510501

511502
R.id.editing_radio_button -> {
512503
customPermissionLayout.visibility = View.GONE
513-
permission = getMaximumPermission()
504+
permission = sharePermissionManager.getMaximumPermission(isFolder())
514505
}
515506

516507
R.id.file_drop_radio_button -> {
@@ -580,7 +571,7 @@ class FileDetailsSharingProcessFragment :
580571
}
581572

582573
shareProcessAllowResharingCheckbox.setOnCheckedChangeListener { _, isChecked ->
583-
togglePermission(getReSharePermission())
574+
permission = sharePermissionManager.getReSharePermission()
584575
}
585576

586577
shareCheckbox.setOnCheckedChangeListener { _, isChecked ->
@@ -663,12 +654,6 @@ class FileDetailsSharingProcessFragment :
663654
fileActivity?.supportFragmentManager?.beginTransaction()?.remove(this)?.commit()
664655
}
665656

666-
private fun getReSharePermission(): Int {
667-
return SharePermissionsBuilder().apply {
668-
setSharePermission(true)
669-
}.build()
670-
}
671-
672657
/**
673658
* method to validate the step 1 screen information
674659
*/

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package com.owncloud.android.ui.fragment.util
99

1010
import com.owncloud.android.lib.common.utils.Log_OC
1111
import com.owncloud.android.lib.resources.shares.OCShare
12+
import com.owncloud.android.lib.resources.shares.SharePermissionsBuilder
1213
import com.owncloud.android.ui.fragment.FileDetailsSharingProcessFragment.Companion.TAG
1314

1415
class SharePermissionManager {
@@ -76,4 +77,18 @@ class SharePermissionManager {
7677
else -> hasUpdate || hasShare
7778
}
7879
}
80+
81+
fun getReSharePermission(): Int {
82+
return SharePermissionsBuilder().apply {
83+
setSharePermission(true)
84+
}.build()
85+
}
86+
87+
fun getMaximumPermission(isFolder: Boolean): Int {
88+
return if (isFolder) {
89+
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER
90+
} else {
91+
OCShare.MAXIMUM_PERMISSIONS_FOR_FILE
92+
}
93+
}
7994
}

0 commit comments

Comments
 (0)