add share attribute field

alperozturk96 · alperozturk96 · commit c88108e7298c · 2025-04-14T08:55:22.000+02:00
Signed-off-by: alperozturk &lt;alper_ozturk@proton.me&gt;
diff --git a/app/schemas/com.nextcloud.client.database.NextcloudDatabase/89.json b/app/schemas/com.nextcloud.client.database.NextcloudDatabase/89.json
diff --git a/app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt b/app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt
@@ -71,7 +71,8 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 84, to = 85, spec = DatabaseMigrationUtil.DeleteColumnSpec::class),
         AutoMigration(from = 85, to = 86, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
         AutoMigration(from = 86, to = 87, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
-        AutoMigration(from = 87, to = 88, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
+        AutoMigration(from = 87, to = 88, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
+        AutoMigration(from = 88, to = 89)
     ],
     exportSchema = true
 )
diff --git a/app/src/main/java/com/nextcloud/client/database/entity/ShareEntity.kt b/app/src/main/java/com/nextcloud/client/database/entity/ShareEntity.kt
@@ -58,5 +58,7 @@ data class ShareEntity(
     @ColumnInfo(name = ProviderTableMeta.OCSHARES_DOWNLOADLIMIT_LIMIT)
     val downloadLimitLimit: Int?,
     @ColumnInfo(name = ProviderTableMeta.OCSHARES_DOWNLOADLIMIT_COUNT)
-    val downloadLimitCount: Int?
+    val downloadLimitCount: Int?,
+    @ColumnInfo(name = ProviderTableMeta.OCSHARES_ATTRIBUTES)
+    val attributes: String?
 )
diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -1566,6 +1566,8 @@ private ContentValues createContentValueForShare(OCShare share) {
             contentValues.putNull(ProviderTableMeta.OCSHARES_DOWNLOADLIMIT_COUNT);
         }
 
+        contentValues.put(ProviderTableMeta.OCSHARES_ATTRIBUTES, share.getAttributes());
+
         return contentValues;
     }
 
@@ -1596,6 +1598,8 @@ private OCShare createShareInstance(Cursor cursor) {
                                                                 getInt(cursor, ProviderTableMeta.OCSHARES_DOWNLOADLIMIT_COUNT));
         share.setFileDownloadLimit(downloadLimit);
 
+        share.setAttributes(getString(cursor,ProviderTableMeta.OCSHARES_ATTRIBUTES));
+
         return share;
     }
 
diff --git a/app/src/main/java/com/owncloud/android/db/ProviderMeta.java b/app/src/main/java/com/owncloud/android/db/ProviderMeta.java
@@ -25,7 +25,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 88;
+    public static final int DB_VERSION = 89;
 
     private ProviderMeta() {
         // No instance
@@ -201,6 +201,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String OCSHARES_SHARE_LABEL = "share_label";
         public static final String OCSHARES_DOWNLOADLIMIT_LIMIT = "download_limit_limit";
         public static final String OCSHARES_DOWNLOADLIMIT_COUNT = "download_limit_count";
+        public static final String OCSHARES_ATTRIBUTES = "attributes";
 
         public static final String OCSHARES_DEFAULT_SORT_ORDER = OCSHARES_FILE_SOURCE
             + " collate nocase asc";
diff --git a/app/src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java b/app/src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java
@@ -56,6 +56,7 @@ public class CreateShareWithShareeOperation extends SyncOperation {
     private String label;
     private final Context context;
     private final User user;
+    private String attributes;
 
     private ArbitraryDataProvider arbitraryDataProvider;
 
@@ -85,6 +86,7 @@ public CreateShareWithShareeOperation(String path,
                                           String sharePassword,
                                           long expirationDateInMillis,
                                           boolean hideFileDownload,
+                                          String attributes,
                                           FileDataStorageManager storageManager,
                                           Context context,
                                           User user,
@@ -105,6 +107,7 @@ public CreateShareWithShareeOperation(String path,
         this.context = context;
         this.user = user;
         this.arbitraryDataProvider = arbitraryDataProvider;
+        this.attributes = attributes;
     }
 
     @Override
@@ -156,7 +159,8 @@ protected RemoteOperationResult run(OwnCloudClient client) {
             false,
             sharePassword,
             permissions,
-            noteMessage
+            noteMessage,
+            attributes
         );
         operation.setGetShareDetails(true);
         RemoteOperationResult shareResult = operation.execute(client);
diff --git a/app/src/main/java/com/owncloud/android/operations/UpdateShareInfoOperation.java b/app/src/main/java/com/owncloud/android/operations/UpdateShareInfoOperation.java
@@ -35,6 +35,7 @@ public class UpdateShareInfoOperation extends SyncOperation {
     private int permissions = -1;
     private String password;
     private String label;
+    private String attributes;
 
     /**
      * Constructor
@@ -93,6 +94,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
         }
         updateOp.setPassword(password);
         updateOp.setLabel(label);
+        updateOp.setAttributes(attributes);
 
         RemoteOperationResult result = updateOp.execute(client);
 
@@ -125,6 +127,10 @@ public void setHideFileDownload(boolean hideFileDownload) {
         this.hideFileDownload = hideFileDownload;
     }
 
+    public void setAttributes(String attributes) {
+        this.attributes = attributes;
+    }
+
     public void setPermissions(int permissions) {
         this.permissions = permissions;
     }
diff --git a/app/src/main/java/com/owncloud/android/services/OperationsService.java b/app/src/main/java/com/owncloud/android/services/OperationsService.java
@@ -101,6 +101,7 @@ public class OperationsService extends Service {
     public static final String EXTRA_SHARE_NOTE = "SHARE_NOTE";
     public static final String EXTRA_IN_BACKGROUND = "IN_BACKGROUND";
     public static final String EXTRA_FILES_DOWNLOAD_LIMIT = "FILES_DOWNLOAD_LIMIT";
+    public static final String EXTRA_SHARE_ATTRIBUTES = "SHARE_ATTRIBUTES";
 
     public static final String ACTION_CREATE_SHARE_VIA_LINK = "CREATE_SHARE_VIA_LINK";
     public static final String ACTION_CREATE_SECURE_FILE_DROP = "CREATE_SECURE_FILE_DROP";
@@ -593,6 +594,8 @@ private Pair<Target, RemoteOperation> newOperation(Intent operationIntent) {
                             .getLongExtra(EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS, 0L);
                         boolean hideFileDownload = operationIntent.getBooleanExtra(EXTRA_SHARE_HIDE_FILE_DOWNLOAD,
                                                                                    false);
+                        String attributes = operationIntent.getStringExtra(EXTRA_SHARE_ATTRIBUTES);
+
                         if (!TextUtils.isEmpty(remotePath)) {
                             CreateShareWithShareeOperation createShareWithShareeOperation =
                                 new CreateShareWithShareeOperation(remotePath,
@@ -603,6 +606,7 @@ private Pair<Target, RemoteOperation> newOperation(Intent operationIntent) {
                                                                    sharePassword,
                                                                    expirationDateInMillis,
                                                                    hideFileDownload,
+                                                                   attributes,
                                                                    fileDataStorageManager,
                                                                    getApplicationContext(),
                                                                    user,
@@ -641,6 +645,9 @@ private Pair<Target, RemoteOperation> newOperation(Intent operationIntent) {
                                 updateShare.setLabel(operationIntent.getStringExtra(EXTRA_SHARE_PUBLIC_LABEL));
                             }
 
+                            String shareAttributes = operationIntent.getStringExtra(EXTRA_SHARE_ATTRIBUTES);
+                            updateShare.setAttributes(shareAttributes);
+
                             operation = updateShare;
                         }
                         break;
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
@@ -490,10 +490,6 @@ class FileDetailsSharingProcessFragment :
                 showExpirationDateDialog()
             }
 
-            shareAllowDownloadAndSyncCheckbox.setOnCheckedChangeListener { _, isChecked ->
-                share
-            }
-
             // region RadioButtons
             shareProcessPermissionRadioGroup.setOnCheckedChangeListener { radioGroup, optionId ->
                 when (optionId) {
@@ -546,6 +542,8 @@ class FileDetailsSharingProcessFragment :
                         isEnabled = false
                     }
                 }
+
+                shareAllowDownloadAndSyncCheckbox.isChecked = isAllowDownloadAndSyncEnabled(share)
             }
         }
 
@@ -564,6 +562,10 @@ class FileDetailsSharingProcessFragment :
         checkboxes.forEach { (checkbox, flag) ->
             checkbox.setOnCheckedChangeListener { _, isChecked -> togglePermission(isChecked, flag) }
         }
+
+        binding.shareAllowDownloadAndSyncCheckbox.setOnCheckedChangeListener { _, isChecked ->
+            share?.attributes = sharePermissionManager.toggleAllowDownloadAndSync(isChecked, share)
+        }
     }
 
     private fun showExpirationDateDialog(chosenDateInMillis: Long = chosenExpDateInMills) {
@@ -726,6 +728,7 @@ class FileDetailsSharingProcessFragment :
             binding.shareProcessEnterPassword.text.toString().trim(),
             chosenExpDateInMills,
             noteText,
+            share?.attributes,
             binding.shareProcessChangeName.text.toString().trim(),
             true
         )
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/util/SharePermissionManager.kt b/app/src/main/java/com/owncloud/android/ui/fragment/util/SharePermissionManager.kt
@@ -9,6 +9,9 @@ package com.owncloud.android.ui.fragment.util
 
 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.lib.resources.shares.attributes.getDownloadAttribute
 import com.owncloud.android.ui.fragment.FileDetailsSharingProcessFragment.Companion.TAG
 
 class SharePermissionManager {
@@ -85,4 +88,32 @@ class SharePermissionManager {
             OCShare.MAXIMUM_PERMISSIONS_FOR_FILE
         }
     }
+
+    fun toggleAllowDownloadAndSync(isChecked: Boolean, share: OCShare?): String? {
+        val shareAttributes = getShareAttributes(share)?.toMutableList()
+        val downloadAttributeIndex = shareAttributes?.indexOf(shareAttributes.getDownloadAttribute())
+        if (downloadAttributeIndex != null && downloadAttributeIndex >= 0) {
+            val updatedAttribute = shareAttributes[downloadAttributeIndex].copy(isEnabled = isChecked)
+            shareAttributes[downloadAttributeIndex] = updatedAttribute
+        }
+
+        if (shareAttributes == null) {
+            return null
+        }
+
+        return ShareAttributesJsonHandler.toJson(shareAttributes)
+    }
+
+    fun isAllowDownloadAndSyncEnabled(share: OCShare?): Boolean {
+        val shareAttributes = getShareAttributes(share)?.toMutableList()
+        return shareAttributes.getDownloadAttribute()?.isEnabled == true
+    }
+
+    private fun getShareAttributes(share: OCShare?): List<ShareAttributes>? {
+        if (share == null || share.attributes == null) {
+            return null
+        }
+
+        return ShareAttributesJsonHandler.parseJson(share.attributes!!)
+    }
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
@@ -546,6 +546,7 @@ public void shareFileWithSharee(OCFile file,
                                     String password,
                                     long expirationTimeInMillis,
                                     String note,
+                                    String attributes,
                                     String label,
                                     boolean showLoadingDialog) {
         if (file != null) {
@@ -567,6 +568,7 @@ public void shareFileWithSharee(OCFile file,
             service.putExtra(OperationsService.EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS, expirationTimeInMillis);
             service.putExtra(OperationsService.EXTRA_SHARE_NOTE, (note == null) ? "" : note);
             service.putExtra(OperationsService.EXTRA_SHARE_PUBLIC_LABEL, (label == null) ? "" : label);
+            service.putExtra(OperationsService.EXTRA_SHARE_ATTRIBUTES, attributes);
 
             mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
 
@@ -775,6 +777,7 @@ public void updateShareInformation(OCShare share, int permissions,
         updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, (password == null) ? "" : password);
         updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS, expirationTimeInMillis);
         updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PUBLIC_LABEL, (label == null) ? "" : label);
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_ATTRIBUTES, share.getAttributes());
         queueShareIntent(updateShareIntent);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,7 @@ data class ShareEntity(`
`58`	`58`	`@ColumnInfo(name = ProviderTableMeta.OCSHARES_DOWNLOADLIMIT_LIMIT)`
`59`	`59`	`val downloadLimitLimit: Int?,`
`60`	`60`	`@ColumnInfo(name = ProviderTableMeta.OCSHARES_DOWNLOADLIMIT_COUNT)`
`61`		`- val downloadLimitCount: Int?`
	`61`	`+ val downloadLimitCount: Int?,`
	`62`	`+ @ColumnInfo(name = ProviderTableMeta.OCSHARES_ATTRIBUTES)`
	`63`	`+ val attributes: String?`
`62`	`64`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1566,6 +1566,8 @@ private ContentValues createContentValueForShare(OCShare share) {`
`1566`	`1566`	`contentValues.putNull(ProviderTableMeta.OCSHARES_DOWNLOADLIMIT_COUNT);`
`1567`	`1567`	`}`
`1568`	`1568`
	`1569`	`+ contentValues.put(ProviderTableMeta.OCSHARES_ATTRIBUTES, share.getAttributes());`
	`1570`	`+`
`1569`	`1571`	`return contentValues;`
`1570`	`1572`	`}`
`1571`	`1573`
`@@ -1596,6 +1598,8 @@ private OCShare createShareInstance(Cursor cursor) {`
`1596`	`1598`	`getInt(cursor, ProviderTableMeta.OCSHARES_DOWNLOADLIMIT_COUNT));`
`1597`	`1599`	`share.setFileDownloadLimit(downloadLimit);`
`1598`	`1600`
	`1601`	`+ share.setAttributes(getString(cursor,ProviderTableMeta.OCSHARES_ATTRIBUTES));`
	`1602`	`+`
`1599`	`1603`	`return share;`
`1600`	`1604`	`}`
`1601`	`1605`
Original file line number	Diff line number	Diff line change
`@@ -490,10 +490,6 @@ class FileDetailsSharingProcessFragment :`
`490`	`490`	`showExpirationDateDialog()`
`491`	`491`	`}`
`492`	`492`
`493`		`- shareAllowDownloadAndSyncCheckbox.setOnCheckedChangeListener { _, isChecked ->`
`494`		`- share`
`495`		`- }`
`496`		`-`
`497`	`493`	`// region RadioButtons`
`498`	`494`	`shareProcessPermissionRadioGroup.setOnCheckedChangeListener { radioGroup, optionId ->`
`499`	`495`	`when (optionId) {`
`@@ -546,6 +542,8 @@ class FileDetailsSharingProcessFragment :`
`546`	`542`	`isEnabled = false`
`547`	`543`	`}`
`548`	`544`	`}`
	`545`	`+`
	`546`	`+ shareAllowDownloadAndSyncCheckbox.isChecked = isAllowDownloadAndSyncEnabled(share)`
`549`	`547`	`}`
`550`	`548`	`}`
`551`	`549`
`@@ -564,6 +562,10 @@ class FileDetailsSharingProcessFragment :`
`564`	`562`	`checkboxes.forEach { (checkbox, flag) ->`
`565`	`563`	`checkbox.setOnCheckedChangeListener { _, isChecked -> togglePermission(isChecked, flag) }`
`566`	`564`	`}`
	`565`	`+`
	`566`	`+ binding.shareAllowDownloadAndSyncCheckbox.setOnCheckedChangeListener { _, isChecked ->`
	`567`	`+ share?.attributes = sharePermissionManager.toggleAllowDownloadAndSync(isChecked, share)`
	`568`	`+ }`
`567`	`569`	`}`
`568`	`570`
`569`	`571`	`private fun showExpirationDateDialog(chosenDateInMillis: Long = chosenExpDateInMills) {`
`@@ -726,6 +728,7 @@ class FileDetailsSharingProcessFragment :`
`726`	`728`	`binding.shareProcessEnterPassword.text.toString().trim(),`
`727`	`729`	`chosenExpDateInMills,`
`728`	`730`	`noteText,`
	`731`	`+ share?.attributes,`
`729`	`732`	`binding.shareProcessChangeName.text.toString().trim(),`
`730`	`733`	`true`
`731`	`734`	`)`