From 5aca300a62ebde2869936b208b971d8b9447cc2a Mon Sep 17 00:00:00 2001 From: Joris Bodin Date: Thu, 2 Jan 2025 17:57:56 +0100 Subject: [PATCH] fix: Indicates that dropbox cannot be used --- .../drive/data/cache/DriveInfosController.kt | 2 +- .../drive/data/models/drive/Drive.kt | 5 --- .../models/drive/DrivePackFunctionality.kt | 40 ------------------- .../FileInfoActionsBottomSheetDialog.kt | 2 +- .../infomaniak/drive/utils/RealmModules.kt | 2 +- 5 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 app/src/main/java/com/infomaniak/drive/data/models/drive/DrivePackFunctionality.kt diff --git a/app/src/main/java/com/infomaniak/drive/data/cache/DriveInfosController.kt b/app/src/main/java/com/infomaniak/drive/data/cache/DriveInfosController.kt index f4ca8d8cb8..a71afc9822 100644 --- a/app/src/main/java/com/infomaniak/drive/data/cache/DriveInfosController.kt +++ b/app/src/main/java/com/infomaniak/drive/data/cache/DriveInfosController.kt @@ -135,7 +135,7 @@ object DriveInfosController { ): Drive? { val block: (Realm) -> Drive? = { realm -> realm.getDrivesQuery(userId, driveId, sharedWithMe, maintenance).findFirst()?.let { - if (customRealm == null) realm.copyFromRealm(it, 1) else it + if (customRealm == null) realm.copyFromRealm(it, 2) else it } } return customRealm?.let(block) ?: getRealmInstance().use(block) diff --git a/app/src/main/java/com/infomaniak/drive/data/models/drive/Drive.kt b/app/src/main/java/com/infomaniak/drive/data/models/drive/Drive.kt index 25766bba21..6ac4fe4460 100644 --- a/app/src/main/java/com/infomaniak/drive/data/models/drive/Drive.kt +++ b/app/src/main/java/com/infomaniak/drive/data/models/drive/Drive.kt @@ -69,8 +69,6 @@ open class Drive( var pack: DrivePack? = DrivePack(), var size: Long = 0, var version: String = "", - @SerializedName("pack_functionality") - private var _packFunctionality: DrivePackFunctionality? = DrivePackFunctionality(), @SerializedName("users") private var _users: DriveUsersCategories? = DriveUsersCategories(), @SerializedName("teams") @@ -81,9 +79,6 @@ open class Drive( val driveAccount: DriveAccount get() = _driveAccount ?: DriveAccount() - val packFunctionality: DrivePackFunctionality - get() = _packFunctionality ?: DrivePackFunctionality() - val preferences: DrivePreferences get() = _preferences ?: DrivePreferences() diff --git a/app/src/main/java/com/infomaniak/drive/data/models/drive/DrivePackFunctionality.kt b/app/src/main/java/com/infomaniak/drive/data/models/drive/DrivePackFunctionality.kt deleted file mode 100644 index 431bfc1cd7..0000000000 --- a/app/src/main/java/com/infomaniak/drive/data/models/drive/DrivePackFunctionality.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Infomaniak kDrive - Android - * Copyright (C) 2022-2024 Infomaniak Network SA - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.infomaniak.drive.data.models.drive - -import com.google.gson.annotations.SerializedName -import io.realm.RealmObject -import io.realm.annotations.RealmClass - -@RealmClass(embedded = true) -open class DrivePackFunctionality( - @SerializedName("can_set_sharelink_expiration") - var canSetSharelinkExpiration: Boolean = false, - @SerializedName("can_set_sharelink_password") - var canSetSharelinkPassword: Boolean = false, - @SerializedName("has_team_space") - var hasTeamSpace: Boolean = false, - @SerializedName("manage_right") - var manageRight: Boolean = false, - @SerializedName("number_of_versions") - var numberOfVersions: Long = 0, - @SerializedName("versions_kept_for_days") - var versionsKeptForDays: Long = 0, - var dropbox: Boolean = false, - var versioning: Boolean = false -) : RealmObject() diff --git a/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/FileInfoActionsBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/FileInfoActionsBottomSheetDialog.kt index 80fa0b8ce8..065912de35 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/FileInfoActionsBottomSheetDialog.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/FileInfoActionsBottomSheetDialog.kt @@ -179,7 +179,7 @@ class FileInfoActionsBottomSheetDialog : BottomSheetDialogFragment(), FileInfoAc ) ) } else { - if (AccountUtils.getCurrentDrive()?.packFunctionality?.dropbox == true) { + if (AccountUtils.getCurrentDrive()?.pack?.capabilities?.useDropbox == true) { safeNavigate( FileInfoActionsBottomSheetDialogDirections.actionFileInfoActionsBottomSheetDialogToConvertToDropBoxFragment( fileId = currentFile.id, diff --git a/app/src/main/java/com/infomaniak/drive/utils/RealmModules.kt b/app/src/main/java/com/infomaniak/drive/utils/RealmModules.kt index 1957db9068..5a7d8b8f68 100644 --- a/app/src/main/java/com/infomaniak/drive/utils/RealmModules.kt +++ b/app/src/main/java/com/infomaniak/drive/utils/RealmModules.kt @@ -47,7 +47,7 @@ object RealmModules { @RealmModule( classes = [ - Drive::class, DrivePackFunctionality::class, DrivePreferences::class, DriveUsersCategories::class, DriveUser::class, + Drive::class, DrivePreferences::class, DriveUsersCategories::class, DriveUser::class, Team::class, TeamDetails::class, DriveTeamsCategories::class, Category::class, CategoryRights::class, DriveCapabilities::class, DrivePack::class, DrivePackCapabilities::class, DriveRights::class, DriveAccount::class, ]