implement allow download and sync

alperozturk96 · alperozturk96 · commit 25a222f7e338 · 2026-02-11T16:26:11.000+01:00
Signed-off-by: alperozturk96 &lt;alper_ozturk@proton.me&gt;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -49,6 +49,7 @@
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.nextcloud.android.sso.model.SingleSignOnAccount;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.OCShare;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -1006,8 +1007,12 @@ public void addShareEntities(List<ShareEntity> entities) {
         db.getShareDao().addShareEntities(entities);
     }
 
-    public List<ShareEntity> getShareEntities(String path) {
-        return db.getShareDao().getShareEntities(path);
+    public ShareEntity getShareByPathAndDisplayName(@NonNull OCShare share) {
+        if (share.getPath() == null || share.getSharedWithDisplayName() == null) {
+            return null;
+        }
+
+        return db.getShareDao().getShareByPathAndDisplayName(share.getPath(), share.getSharedWithDisplayName());
     }
 
     public void deleteShareById(int id) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/ShareDao.kt
@@ -18,8 +18,16 @@ interface ShareDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun addShareEntities(entities: List<ShareEntity>)
 
-    @Query("SELECT * FROM share_table WHERE path = :path")
-    fun getShareEntities(path: String): List<ShareEntity>
+    @Query("""
+        SELECT * FROM share_table 
+        WHERE path = :path 
+        AND share_with_displayname = :displayName 
+        LIMIT 1
+    """)
+    fun getShareByPathAndDisplayName(
+        path: String,
+        displayName: String
+    ): ShareEntity?
 
     @Query("DELETE FROM share_table WHERE id = :id")
     fun deleteById(id: Int)
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt
@@ -26,5 +26,6 @@ data class ShareEntity(
     val displayname_owner: String? = null,
     val url: String? = null,
     val expiration_date: Long? = null,
-    val permissions: Double? = null
+    val permissions: Double? = null,
+    val attributes: String? = null
 )
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -865,8 +865,8 @@ public void setPasswordToShare(@NotNull OCShare share, @Nullable String password
                     share.getNote(),
                     share.getLabel(),
                     DateUtil.INSTANCE.getExpirationDate(share.getExpirationDate()),
-                    "[]",
-                    Boolean.toString(share.isHideFileDownload())
+                    Boolean.toString(share.isHideFileDownload()),
+                    ""
                 );
                 final var result = repository.updateShare(share.getId(), requestBody);
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -27,6 +27,8 @@ import it.niedermann.owncloud.notes.persistence.isSuccess
 import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
 import it.niedermann.owncloud.notes.share.helper.SharePermissionManager
 import it.niedermann.owncloud.notes.share.model.QuickPermissionType
+import it.niedermann.owncloud.notes.share.model.ShareAttributesV1
+import it.niedermann.owncloud.notes.share.model.ShareAttributesV2
 import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
 import it.niedermann.owncloud.notes.share.repository.ShareRepository
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils
@@ -149,6 +151,7 @@ class NoteShareDetailActivity :
             }
 
             util.androidx.run {
+                colorSwitchCompat(allowDownloadAndSync)
                 colorSwitchCompat(shareProcessSetPasswordSwitch)
                 colorSwitchCompat(shareProcessSetExpDateSwitch)
                 colorSwitchCompat(shareProcessHideDownloadCheckbox)
@@ -326,6 +329,23 @@ class NoteShareDetailActivity :
             shareProcessChangeNameContainer.visibility = View.GONE
             shareProcessHideDownloadCheckbox.visibility = View.GONE
             shareProcessSetPasswordSwitch.visibility = View.GONE
+            allowDownloadAndSync.visibility = View.VISIBLE
+
+            share?.let {
+                val entity = repository.getShareByPathAndDisplayName(it)
+                val attributes = entity?.attributes ?: return
+                share?.attributes = attributes
+
+                val capabilities = repository.getCapabilities()
+                val shouldUseShareAttributesV2 = (capabilities.nextcloudMajorVersion?.toInt() ?: 0) >= 30
+                val isDownloadAndAllowsSyncEnabled = if (shouldUseShareAttributesV2) {
+                    ShareAttributesV2.getAttributes(attributes).first().value
+                } else {
+                    ShareAttributesV1.getAttributes(attributes).first().enabled
+                }
+
+                binding.allowDownloadAndSync.isChecked = isDownloadAndAllowsSyncEnabled
+            }
         }
     }
 
@@ -577,7 +597,11 @@ class NoteShareDetailActivity :
             expireDate = DateUtil.getExpirationDate(chosenExpDateInMills),
             label = label,
             note = noteText,
-            attributes = "[]",
+            attributes = UpdateShareRequest.createAttributes(
+                repository.getCapabilities(),
+                binding.allowDownloadAndSync.isChecked,
+                shareType
+            ),
             hideDownload = binding.shareProcessHideDownloadCheckbox.isChecked.toString()
         )
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/model/UpdateShareRequest.kt
@@ -6,8 +6,12 @@
  */
 package it.niedermann.owncloud.notes.share.model
 
+import com.google.gson.Gson
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import com.owncloud.android.lib.resources.shares.ShareType
+import it.niedermann.owncloud.notes.shared.model.Capabilities
 
 data class UpdateShareRequest(
     @Expose
@@ -37,4 +41,58 @@ data class UpdateShareRequest(
     @Expose
     @SerializedName("attributes")
     val attributes: String? = null
-)
+) {
+    companion object {
+        fun createAttributes(capabilities: Capabilities, allowDownloadAndSync: Boolean, type: ShareType): String {
+            if (type != ShareType.INTERNAL && type != ShareType.USER) {
+                return "[]"
+            }
+
+            val shouldUseShareAttributesV2 = (capabilities.nextcloudMajorVersion?.toInt() ?: 0) >= 30
+
+            val shareAttributes = arrayOf(
+                if (shouldUseShareAttributesV2) {
+                    ShareAttributesV2(
+                        scope = "permissions",
+                        key = "download",
+                        value = allowDownloadAndSync
+                    )
+                } else {
+                    ShareAttributesV1(
+                        scope = "permissions",
+                        key = "download",
+                        enabled = allowDownloadAndSync
+                    )
+                }
+            )
+
+            return Gson().toJson(shareAttributes)
+        }
+    }
+}
+
+data class ShareAttributesV2(
+    var scope: String,
+    var key: String,
+    var value: Boolean
+) {
+    companion object {
+        fun getAttributes(json: String): List<ShareAttributesV2> {
+            val type = object : TypeToken<List<ShareAttributesV2>>() {}.type
+            return Gson().fromJson(json, type)
+        }
+    }
+}
+
+data class ShareAttributesV1(
+    var scope: String,
+    var key: String,
+    var enabled: Boolean
+) {
+    companion object {
+        fun getAttributes(json: String): List<ShareAttributesV1> {
+            val typeV1 = object : TypeToken<List<ShareAttributesV1>>() {}.type
+            return Gson().fromJson(json, typeV1)
+        }
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/repository/ShareRepository.kt
@@ -94,6 +94,7 @@ class ShareRepository(private val applicationContext: Context, private val accou
                     val url = map?.get("url") as? String
                     val expirationDateString = map?.get("expiration") as? String
                     val permissions = map?.get("permissions") as? Double
+                    val attributes = map?.get("attributes") as? String
 
                     id?.toInt()?.let {
                         val entity = ShareEntity(
@@ -109,7 +110,8 @@ class ShareRepository(private val applicationContext: Context, private val accou
                             displayname_owner = displayNameOwner,
                             url = url,
                             expiration_date = expirationDateString?.toExpirationDateLong(),
-                            permissions = permissions
+                            permissions = permissions,
+                            attributes = attributes
                         )
 
                         entities.add(entity)
@@ -123,6 +125,10 @@ class ShareRepository(private val applicationContext: Context, private val accou
         }
     }
 
+    fun getShareByPathAndDisplayName(share: OCShare): ShareEntity? {
+        return notesRepository.getShareByPathAndDisplayName(share)
+    }
+
     private fun LinkedTreeMap<*, *>.getList(key: String): ArrayList<*>? = this[key] as? ArrayList<*>
 
     /**
diff --git a/app/src/main/res/layout/activity_note_share_detail.xml b/app/src/main/res/layout/activity_note_share_detail.xml
@@ -135,6 +135,16 @@
                 android:background="@color/text_color" />
 
 
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/allow_download_and_sync"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacer_1x"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:text="@string/note_share_detail_activity_allow_download_and_sync"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
             <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/share_process_hide_download_checkbox"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -71,6 +71,7 @@
     <!-- NoteShareDetailActivity -->
     <string name="note_share_detail_activity_password_error_message">This password looks a bit weak. For better security, try using a longer password with a mix of letters, numbers, and symbols.</string>
     <string name="note_share_detail_activity_share_via_link_hide_download">Hide download</string>
+    <string name="note_share_detail_activity_allow_download_and_sync">Allow download and sync</string>
     <string name="note_share_detail_activity_share_send_note">Note to recipient</string>
     <string name="note_share_detail_activity_hint_note">Note</string>
     <string name="note_share_detail_activity_common_next">Next</string>

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,6 @@ data class ShareEntity(`
`26`	`26`	`val displayname_owner: String? = null,`
`27`	`27`	`val url: String? = null,`
`28`	`28`	`val expiration_date: Long? = null,`
`29`		`- val permissions: Double? = null`
	`29`	`+ val permissions: Double? = null,`
	`30`	`+ val attributes: String? = null`
`30`	`31`	`)`