Skip to content

Feature - Use default sharing permissions #14695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 6 commits into from
Apr 3, 2025
Merged

Feature - Use default sharing permissions #14695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a4dedfd
add PROPERTY_DEFAULT_PERMISSIONS
alperozturk96 Mar 17, 2025
24defbc
use default permission
alperozturk96 Mar 17, 2025
ac36c62
use default permission
alperozturk96 Mar 17, 2025
20810d4
update lib
alperozturk96 Mar 17, 2025
e5905f5
update android lib
alperozturk96 Apr 2, 2025
e36a0d5
update android lib
alperozturk96 Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,343 changes: 1,343 additions & 0 deletions app/schemas/com.nextcloud.client.database.NextcloudDatabase/88.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
)
4 changes: 4 additions & 0 deletions app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/owncloud/android/db/ProviderMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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";
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
buildscript {
ext {
androidLibraryVersion ="766e7b818cace55031c010d949645b991dd340e0"
androidLibraryVersion ="4e47b7649d224217830101779e37add5344a3805"
androidCommonLibraryVersion = "0.25.0"
androidPluginVersion = "8.9.0"
androidxMediaVersion = "1.5.1"
Expand Down
24 changes: 24 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand Down
Loading