Skip to content

Commit 9af005d

Browse files
committed
remove unnecessary allow reshare checkbox
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 7107e95 commit 9af005d

4 files changed

Lines changed: 5 additions & 45 deletions

File tree

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

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ class FileDetailsSharingProcessFragment :
218218
themeCheckbox(shareEditCheckbox)
219219
themeCheckbox(shareCheckbox)
220220
themeCheckbox(shareDeleteCheckbox)
221-
222-
themeCheckbox(shareProcessAllowResharingCheckbox)
223221
}
224222
}
225223

@@ -269,10 +267,6 @@ class FileDetailsSharingProcessFragment :
269267
setupUpdateUI()
270268
}
271269

272-
if (isSecureShare) {
273-
binding.shareProcessAdvancePermissionTitle.visibility = View.GONE
274-
}
275-
276270
// show or hide expiry date
277271
binding.shareProcessSetExpDateSwitch.setVisibleIf(isExpDateShown && !isSecureShare)
278272
shareProcessStep = SCREEN_TYPE_PERMISSION
@@ -370,25 +364,21 @@ class FileDetailsSharingProcessFragment :
370364
binding.shareProcessChangeNameSwitch.visibility = View.GONE
371365
binding.shareProcessChangeNameContainer.visibility = View.GONE
372366
binding.shareProcessHideDownloadCheckbox.visibility = View.GONE
373-
if (isSecureShare) {
374-
binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
375-
} else {
376-
binding.shareProcessAllowResharingCheckbox.visibility = View.VISIBLE
377-
}
367+
binding.shareCheckbox.setVisibleIf(!isSecureShare)
378368
binding.shareProcessSetPasswordSwitch.visibility = View.GONE
379369

380370
if (share != null) {
381371
if (!isReShareShown) {
382-
binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
372+
binding.shareCheckbox.visibility = View.GONE
383373
}
384-
binding.shareProcessAllowResharingCheckbox.isChecked = SharingMenuHelper.canReshare(share)
374+
binding.shareCheckbox.isChecked = SharingMenuHelper.canReshare(share)
385375
}
386376
}
387377

388378
private fun updateViewForExternalAndLinkShare() {
389379
binding.run {
390380
shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
391-
shareProcessAllowResharingCheckbox.visibility = View.GONE
381+
shareCheckbox.visibility = View.GONE
392382
shareProcessSetPasswordSwitch.visibility = View.VISIBLE
393383

394384
if (share != null) {
@@ -444,7 +434,7 @@ class FileDetailsSharingProcessFragment :
444434
fileDropRadioButton.visibility = View.VISIBLE
445435
if (isSecureShare) {
446436
fileDropRadioButton.visibility = View.GONE
447-
shareProcessAllowResharingCheckbox.visibility = View.GONE
437+
shareCheckbox.visibility = View.GONE
448438
shareProcessSetExpDateSwitch.visibility = View.GONE
449439
}
450440
}
@@ -577,10 +567,6 @@ class FileDetailsSharingProcessFragment :
577567
togglePermission(OCShare.UPDATE_PERMISSION_FLAG)
578568
}
579569

580-
shareProcessAllowResharingCheckbox.setOnCheckedChangeListener { _, isChecked ->
581-
permission = sharePermissionManager.getReSharePermission()
582-
}
583-
584570
shareCheckbox.setOnCheckedChangeListener { _, isChecked ->
585571
togglePermission(OCShare.SHARE_PERMISSION_FLAG)
586572
}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ 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
1312
import com.owncloud.android.ui.fragment.FileDetailsSharingProcessFragment.Companion.TAG
1413

1514
class SharePermissionManager {
@@ -78,12 +77,6 @@ class SharePermissionManager {
7877
}
7978
}
8079

81-
fun getReSharePermission(): Int {
82-
return SharePermissionsBuilder().apply {
83-
setSharePermission(true)
84-
}.build()
85-
}
86-
8780
fun getMaximumPermission(isFolder: Boolean): Int {
8881
return if (isFolder) {
8982
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER

app/src/main/res/layout/file_details_sharing_process_fragment.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,6 @@
7474

7575
</RadioGroup>
7676

77-
<androidx.appcompat.widget.AppCompatTextView
78-
android:id="@+id/share_process_advance_permission_title"
79-
android:layout_width="match_parent"
80-
android:layout_height="wrap_content"
81-
android:layout_marginTop="@dimen/standard_margin"
82-
android:text="@string/advanced_settings"
83-
android:textColor="@color/primary"
84-
android:textStyle="bold"/>
85-
86-
<com.google.android.material.checkbox.MaterialCheckBox
87-
android:id="@+id/share_process_allow_resharing_checkbox"
88-
android:layout_width="match_parent"
89-
android:layout_height="wrap_content"
90-
android:minHeight="@dimen/minimum_size_for_touchable_area"
91-
android:text="@string/allow_resharing"
92-
android:visibility="gone"
93-
tools:visibility="visible" />
94-
9577
<LinearLayout
9678
android:id="@+id/custom_permission_layout"
9779
tools:visibility="visible"

app/src/main/res/values/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,6 @@
11701170
<string name="share_permission_file_drop">File drop</string>
11711171
<string name="share_permission_secure_file_drop">Secure file drop</string>
11721172
<string name="share_permissions">Share permissions</string>
1173-
<string name="advanced_settings">Advanced settings</string>
11741173
<string name="common_next">Next</string>
11751174
<string name="send_share">Send share</string>
11761175
<string name="no_share_permission_selected">Please select at least one permission to share.</string>

0 commit comments

Comments
 (0)