mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-29 02:38:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rebase, Add Migration84to85

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-09-23 14:50:39 +02:00
parent 1c41a1f6cb
commit 9984571aaa
No known key found for this signature in database
GPG key ID: 4E577DC593B59BDF
4 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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()
}

47
app/src/main/java/com/nextcloud/client/database/migrations/Migration84to85.kt Normal file
View file

@ -0,0 +1,47 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2024 Alper Ozturk <alper.ozturk@nextcloud.com>
* 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
)
}
}
}

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

@ -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,

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

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