use lib extensions

Signed-off-by: alperozturk <alper_ozturk@proton.me>

Author: alperozturk96

app/src/androidTest/java/com/nextcloud/utils/SharePermissionManagerTest.kt

@@ -10,6 +10,8 @@ package com.nextcloud.utils
 import com.owncloud.android.datamodel.quickPermission.QuickPermissionType
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
+import com.owncloud.android.lib.resources.shares.extensions.isAllowDownloadAndSyncEnabled
+import com.owncloud.android.lib.resources.shares.extensions.toggleAllowDownloadAndSync
 import com.owncloud.android.ui.fragment.util.SharePermissionManager
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
@@ -249,18 +251,22 @@ class SharePermissionManagerTest {
     // region Attributes Tests
     @Test
     fun testToggleAllowDownloadAndSyncShouldCreateAttributeJsonIfNoneExists() {
-        val attributes = SharePermissionManager.toggleAllowDownloadAndSync(
+        val ocShare = OCShare().apply {
+            isFolder = true
+            shareType = ShareType.USER
+            permissions = 17
+        }
+        ocShare.attributes = ocShare.toggleAllowDownloadAndSync(
             isChecked = true,
-            useV2DownloadAttributes = false,
-            share = null
+            useV2DownloadAttributes = false
         )
-        assertTrue(SharePermissionManager.isAllowDownloadAndSyncEnabled(attributes, false))
+        assertTrue(ocShare.isAllowDownloadAndSyncEnabled(false))
     }
 
     @Test
     fun testIsAllowDownloadAndSyncEnabledShouldReturnFalseIfAttributeIsMissing() {
         val share = createShare(OCShare.READ_PERMISSION_FLAG, attributesJson = null)
-        assertFalse(SharePermissionManager.isAllowDownloadAndSyncEnabled(share.attributes, false))
+        assertFalse(share.isAllowDownloadAndSyncEnabled(false))
     }
     // endregion
 }

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

@@ -28,6 +28,8 @@ import com.owncloud.android.datamodel.quickPermission.QuickPermissionType
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
+import com.owncloud.android.lib.resources.shares.extensions.isAllowDownloadAndSyncEnabled
+import com.owncloud.android.lib.resources.shares.extensions.toggleAllowDownloadAndSync
 import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OCCapability
 import com.owncloud.android.ui.activity.FileActivity
@@ -631,7 +633,7 @@ class FileDetailsSharingProcessFragment :
 
                 if (!isPublicShare()) {
                     shareAllowDownloadAndSyncCheckbox.isChecked =
-                        isAllowDownloadAndSyncEnabled(share?.attributes, useV2DownloadAttributes())
+                        share?.isAllowDownloadAndSyncEnabled(useV2DownloadAttributes()) == true
                 }
             }
         }
@@ -654,9 +656,7 @@ class FileDetailsSharingProcessFragment :
 
         if (!isPublicShare()) {
             binding.shareAllowDownloadAndSyncCheckbox.setOnCheckedChangeListener { _, isChecked ->
-                val result =
-                    SharePermissionManager
-                        .toggleAllowDownloadAndSync(isChecked, useV2DownloadAttributes(), share)
+                val result = share.toggleAllowDownloadAndSync(isChecked, useV2DownloadAttributes())
                 share?.attributes = result
                 downloadAttribute = result
             }

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

@@ -10,11 +10,7 @@ package com.owncloud.android.ui.fragment.util
 import com.owncloud.android.datamodel.quickPermission.QuickPermissionType
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
-import com.owncloud.android.lib.resources.shares.attributes.ShareAttributes
-import com.owncloud.android.lib.resources.shares.attributes.ShareAttributesJsonHandler
 import com.owncloud.android.ui.fragment.FileDetailsSharingProcessFragment.Companion.TAG
-import org.json.JSONArray
-import org.json.JSONObject
 
 object SharePermissionManager {
 
@@ -67,71 +63,6 @@ object SharePermissionManager {
     }
     // endregion
 
-    // region DownloadAttribute
-    fun toggleAllowDownloadAndSync(
-        isChecked: Boolean,
-        useV2DownloadAttributes: Boolean,
-        share: OCShare?
-    ): String? {
-        val jsonArray = if (share?.attributes.isNullOrEmpty()) {
-            JSONArray()
-        } else {
-            JSONArray(share.attributes)
-        }
-
-        val downloadAttr = getDownloadPermissionAttribute(jsonArray)
-
-        if (downloadAttr != null) {
-            if (useV2DownloadAttributes) {
-                downloadAttr.put("value", isChecked)
-            } else {
-                downloadAttr.put("enabled", isChecked)
-            }
-        } else {
-            val newAttr = JSONObject().apply {
-                put("key", "download")
-                put("scope", "permissions")
-                if (useV2DownloadAttributes) {
-                    put("value", isChecked)
-                } else {
-                    put("enabled", isChecked)
-                }
-            }
-            jsonArray.put(newAttr)
-        }
-
-        return jsonArray.toString()
-    }
-
-
-    private fun getDownloadPermissionAttribute(jsonArray: JSONArray): JSONObject? {
-        for (i in 0 until jsonArray.length()) {
-            val obj = jsonArray.getJSONObject(i)
-            if (obj.optString("key") == "download" && obj.optString("scope") == "permissions") {
-                return obj
-            }
-        }
-        return null
-    }
-
-    fun isAllowDownloadAndSyncEnabled(attributes: String?, useV2DownloadAttributes: Boolean): Boolean {
-        if (attributes.isNullOrEmpty()) return false
-
-        val jsonArray = JSONArray(attributes)
-        val downloadAttr = getDownloadPermissionAttribute(jsonArray)
-
-        return if (useV2DownloadAttributes) {
-            downloadAttr?.optBoolean("value", false) ?: false
-        } else {
-            downloadAttr?.optBoolean("enabled", false) ?: false
-        }
-    }
-
-    private fun getShareDownloadAttributes(share: OCShare?): List<ShareAttributes>? {
-        return share?.attributes?.let { ShareAttributesJsonHandler.toList(it) }
-    }
-    // endregion
-
     // region Helper Methods
     fun canEdit(share: OCShare?): Boolean {
         if (share == null) {