Rebase, Add Migration84to85

Signed-off-by: alperozturk <[email protected]>

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt

@@ -29,6 +29,7 @@ import com.nextcloud.client.database.entity.SyncedFolderEntity
 import com.nextcloud.client.database.entity.UploadEntity
 import com.nextcloud.client.database.entity.VirtualEntity
 import com.nextcloud.client.database.migrations.DatabaseMigrationUtil
+import com.nextcloud.client.database.migrations.Migration84to85
 import com.nextcloud.client.database.migrations.Migration67to68
 import com.nextcloud.client.database.migrations.RoomMigration
 import com.nextcloud.client.database.migrations.addLegacyMigrations
@@ -101,6 +102,7 @@ abstract class NextcloudDatabase : RoomDatabase() {
                     .addLegacyMigrations(clock, context)
                     .addMigrations(RoomMigration())
                     .addMigrations(Migration67to68())
+                    .addMigrations(Migration84to85)
                     .fallbackToDestructiveMigration()
                     .build()
             }

app/src/main/java/com/nextcloud/client/database/migrations/Migration84to85.kt

@@ -0,0 +1,47 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2024 Alper Ozturk <[email protected]>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.client.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import com.owncloud.android.db.ProviderMeta
+
+@Suppress("MagicNumber", "NestedBlockDepth")
+val Migration84to85 = object : Migration(84, 85) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.run {
+            execSQL(
+                """
+            CREATE TABLE IF NOT EXISTS `offline_operations_new` (
+                `_id` INTEGER PRIMARY KEY AUTOINCREMENT,
+                `offline_operations_parent_oc_file_id` INTEGER,
+                `offline_operations_path` TEXT,
+                `offline_operations_type` TEXT,
+                `offline_operations_file_name` TEXT,
+                `offline_operations_created_at` INTEGER
+            )
+        """
+            )
+
+            execSQL(
+                """
+            INSERT INTO offline_operations_new 
+            SELECT _id, offline_operations_parent_oc_file_id, offline_operations_path, 
+                   offline_operations_type, offline_operations_file_name, offline_operations_created_at 
+            FROM ${ProviderMeta.ProviderTableMeta.OFFLINE_OPERATION_TABLE_NAME}
+        """
+            )
+
+            execSQL("DROP TABLE ${ProviderMeta.ProviderTableMeta.OFFLINE_OPERATION_TABLE_NAME}")
+            execSQL(
+                "ALTER TABLE offline_operations_new RENAME TO " +
+                    ProviderMeta.ProviderTableMeta.OFFLINE_OPERATION_TABLE_NAME
+            )
+        }
+    }
+}

app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt

@@ -32,7 +32,7 @@ object FileNameValidator {
      * @param existedFileNames Set of existing file names to avoid duplicates.
      * @return An error message if the filename is invalid, null otherwise.
      */
-    @Suppress("ReturnCount")
+    @Suppress("ReturnCount", "NestedBlockDepth")
     fun checkFileName(
         filename: String,
         capability: OCCapability,

app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.kt

@@ -192,8 +192,7 @@ class CreateFolderDialogFragment : DialogFragment(), DialogInterface.OnClickList
                         parentFolder?.fileId
                     )
 
-                    val fileDisplayActivity = requireActivity() as? FileDisplayActivity
-                    fileDisplayActivity?.refreshCurrentDirectory()
+                    typedActivity<FileDisplayActivity>()?.refreshCurrentDirectory()
                 }
             }
         }