Merge pull request #14695 from nextcloud/feature/use-default-sharing-permissions

tobiasKaminsky · web-flow · commit bcc5faf7a5e6 · 2025-04-03T08:59:10.000+02:00
Feature - Use default sharing permissions
diff --git a/app/schemas/com.nextcloud.client.database.NextcloudDatabase/88.json b/app/schemas/com.nextcloud.client.database.NextcloudDatabase/88.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
@@ -70,7 +70,8 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 83, to = 84),
         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 = 86, to = 87, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
+        AutoMigration(from = 87, to = 88, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
     ],
     exportSchema = true
 )
diff --git a/app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt b/app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt
@@ -138,5 +138,7 @@ data class CapabilityEntity(
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_RECOMMENDATION)
     val recommendation: Int?,
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH)
-    val notesFolderPath: String?
+    val notesFolderPath: String?,
+    @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS)
+    val defaultPermissions: Int?
 )
diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -2317,6 +2317,8 @@ private ContentValues createContentValues(String accountName, OCCapability capab
 
         contentValues.put(ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH, capability.getNotesFolderPath());
 
+        contentValues.put(ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS, capability.getDefaultPermissions());
+
         return contentValues;
     }
 
@@ -2496,6 +2498,8 @@ private OCCapability createCapabilityInstance(Cursor cursor) {
             capability.setRecommendations(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_RECOMMENDATION));
 
             capability.setNotesFolderPath(getString(cursor, ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH));
+
+            capability.setDefaultPermissions(getInt(cursor, ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS));
         }
 
         return capability;
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 = 87;
+    public static final int DB_VERSION = 88;
 
     private ProviderMeta() {
         // No instance
@@ -273,6 +273,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String CAPABILITIES_FILES_DOWNLOAD_LIMIT = "files_download_limit";
         public static final String CAPABILITIES_FILES_DOWNLOAD_LIMIT_DEFAULT = "files_download_limit_default";
         public static final String CAPABILITIES_NOTES_FOLDER_PATH = "notes_folder_path";
+        public static final String CAPABILITIES_DEFAULT_PERMISSIONS = "default_permissions";
 
         //Columns of Uploads table
         public static final String UPLOADS_LOCAL_PATH = "local_path";
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
@@ -169,6 +169,8 @@ class FileDetailsSharingProcessFragment :
         capabilities = CapabilityUtils.getCapability(context)
 
         requireNotNull(fileActivity) { "FileActivity may not be null" }
+
+        permission = capabilities.defaultPermissions ?: OCShare.NO_PERMISSION
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@
  */
 buildscript {
     ext {
-        androidLibraryVersion ="766e7b818cace55031c010d949645b991dd340e0"
+        androidLibraryVersion ="4e47b7649d224217830101779e37add5344a3805"
         androidCommonLibraryVersion = "0.25.0"
         androidPluginVersion = "8.9.0"
         androidxMediaVersion = "1.5.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -9893,6 +9893,14 @@
             <sha256 value="fc987eaf53cefe50c60453d32727bb23bb1818eb4898ef89abce4d001c0f87c5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="0bc996e6b6">
+         <artifact name="android-library-0bc996e6b6.aar">
+            <sha256 value="944bc1de6496e567dd53573007a81102788f869d6ad83f6690f3cb4a156e1280" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-0bc996e6b6.module">
+            <sha256 value="e49e3446832e8832a399435b423c5145ee0ac0a1cc790606ebb32efbf9f993e2" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="0c886d61f6">
          <artifact name="android-library-0c886d61f6.aar">
             <sha256 value="9c3a87487717acd878305a00f0d6f2337b9f5512d541f7ac46b9bdb5a53020b9" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -10029,6 +10037,22 @@
             <sha256 value="faaf14410c3697725f5a5908474d716099c272101924179c5c55b6419cd2fbc9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="4e47b7649d">
+         <artifact name="android-library-4e47b7649d.aar">
+            <sha256 value="58af3e5dc59290e8c17da6a8300689f086e9b3f8c2865042b23814cf8671a3c3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-4e47b7649d.module">
+            <sha256 value="014a9a3437f0200d3ad8753a4e7524dd11dd3e9688c01bd0a579b82af3c2de21" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.nextcloud" name="android-library" version="4e47b7649d224217830101779e37add5344a3805">
+         <artifact name="android-library-4e47b7649d224217830101779e37add5344a3805.aar">
+            <sha256 value="58af3e5dc59290e8c17da6a8300689f086e9b3f8c2865042b23814cf8671a3c3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-4e47b7649d224217830101779e37add5344a3805.module">
+            <sha256 value="73bf20a162d85d2962489b53591f18adc4d38f1589ca9409f4dbe3654a9c05f4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="55a8c0532461d0742f81c8593f4807e9ba727b9e">
          <artifact name="android-library-55a8c0532461d0742f81c8593f4807e9ba727b9e.aar">
             <sha256 value="7b1c45e5af11857cf1e18d4d4a9347d97b253426f6cad5956c5da058587286a0" origin="Generated by Gradle" reason="Artifact is not signed"/>

Original file line number	Diff line number	Diff line change
`@@ -138,5 +138,7 @@ data class CapabilityEntity(`
`138`	`138`	`@ColumnInfo(name = ProviderTableMeta.CAPABILITIES_RECOMMENDATION)`
`139`	`139`	`val recommendation: Int?,`
`140`	`140`	`@ColumnInfo(name = ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH)`
`141`		`- val notesFolderPath: String?`
	`141`	`+ val notesFolderPath: String?,`
	`142`	`+ @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS)`
	`143`	`+ val defaultPermissions: Int?`
`142`	`144`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2317,6 +2317,8 @@ private ContentValues createContentValues(String accountName, OCCapability capab`
`2317`	`2317`
`2318`	`2318`	`contentValues.put(ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH, capability.getNotesFolderPath());`
`2319`	`2319`
	`2320`	`+ contentValues.put(ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS, capability.getDefaultPermissions());`
	`2321`	`+`
`2320`	`2322`	`return contentValues;`
`2321`	`2323`	`}`
`2322`	`2324`
`@@ -2496,6 +2498,8 @@ private OCCapability createCapabilityInstance(Cursor cursor) {`
`2496`	`2498`	`capability.setRecommendations(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_RECOMMENDATION));`
`2497`	`2499`
`2498`	`2500`	`capability.setNotesFolderPath(getString(cursor, ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH));`
	`2501`	`+`
	`2502`	`+ capability.setDefaultPermissions(getInt(cursor, ProviderTableMeta.CAPABILITIES_DEFAULT_PERMISSIONS));`
`2499`	`2503`	`}`
`2500`	`2504`
`2501`	`2505`	`return capability;`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,8 @@ class FileDetailsSharingProcessFragment :`
`169`	`169`	`capabilities = CapabilityUtils.getCapability(context)`
`170`	`170`
`171`	`171`	`requireNotNull(fileActivity) { "FileActivity may not be null" }`
	`172`	`+`
	`173`	`+ permission = capabilities.defaultPermissions ?: OCShare.NO_PERMISSION`
`172`	`174`	`}`
`173`	`175`
`174`	`176`	`override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {`