fix: Indicates that dropbox cannot be used (#1508)

Infomaniak · Jan 3, 2025 · bf4f68b · bf4f68b
2 parents eacd4d9 + 5aca300
commit bf4f68b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 48 deletions.
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
@@ -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
@@ -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
diff --git a/.../main/java/com/infomaniak/drive/ui/bottomSheetDialogs/FileInfoActionsBottomSheetDialog.kt b/.../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
@@ -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,
         ]