Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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,313 changes: 1,313 additions & 0 deletions app/schemas/com.nextcloud.client.database.NextcloudDatabase/101.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.isRoot
import com.nextcloud.test.TestActivity
import com.nextcloud.ui.ImageDetailFragment
import com.nextcloud.ui.fileInfo.FileInfoFragment
import com.owncloud.android.AbstractIT
import com.owncloud.android.R
import com.owncloud.android.datamodel.OCFile
Expand Down Expand Up @@ -79,7 +79,7 @@ class FileDetailFragmentStaticServerIT : AbstractIT() {
var activity: TestActivity? = null
scenario.onActivity { sut ->
activity = sut
val fragment = ImageDetailFragment.newInstance(oCFile, user).apply {
val fragment = FileInfoFragment.newInstance(oCFile, user).apply {
hideMap()
}
sut.addFragment(fragment)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import com.nextcloud.client.database.entity.VirtualEntity
import com.nextcloud.client.database.migrations.DatabaseMigrationUtil
import com.nextcloud.client.database.migrations.MIGRATION_88_89
import com.nextcloud.client.database.migrations.MIGRATION_97_98
import com.nextcloud.client.database.migrations.MIGRATION_100_101
import com.nextcloud.client.database.migrations.MIGRATION_99_100
import com.nextcloud.client.database.migrations.Migration67to68
import com.nextcloud.client.database.migrations.RoomMigration
Expand Down Expand Up @@ -99,6 +100,7 @@ import com.owncloud.android.db.ProviderMeta
// manual migration used for 97 to 98
AutoMigration(from = 98, to = 99)
// manual migration used for 99 to 100
// manual migration used for 100 to 101
],
exportSchema = true
)
Expand Down Expand Up @@ -139,6 +141,7 @@ abstract class NextcloudDatabase : RoomDatabase() {
.addMigrations(MIGRATION_88_89)
.addMigrations(MIGRATION_97_98)
.addMigrations(MIGRATION_99_100)
.addMigrations(MIGRATION_100_101)
.build()
}
return instance!!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ data class CapabilityEntity(
val dropAccount: Int?,
@ColumnInfo(name = ProviderTableMeta.CAPABILITIES_SECURITY_GUARD)
val securityGuard: Int?,
@ColumnInfo(name = ProviderTableMeta.CAPABILITIES_GOVERNANCE)
val governance: Int?,
@ColumnInfo(name = ProviderTableMeta.CAPABILITIES_FORBIDDEN_FILENAME_CHARACTERS)
val forbiddenFileNameCharacters: String?,
@ColumnInfo(name = ProviderTableMeta.CAPABILITIES_FORBIDDEN_FILENAMES)
Expand Down Expand Up @@ -220,6 +222,7 @@ fun CapabilityEntity?.toOCCapability(): OCCapability {
capability.groupfolders = intToBoolean(this.groupfolders)
capability.dropAccount = intToBoolean(this.dropAccount)
capability.securityGuard = intToBoolean(this.securityGuard)
capability.governance = intToBoolean(this.governance)
capability.forbiddenFilenameCharactersJson = this.forbiddenFileNameCharacters
capability.forbiddenFilenamesJson = this.forbiddenFileNames
capability.forbiddenFilenameExtensionJson = this.forbiddenFileNameExtensions
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

package com.nextcloud.client.database.migrations

import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase

@Suppress("MagicNumber", "LongMethod")
val MIGRATION_100_101 = object : Migration(100, 101) {
override fun migrate(db: SupportSQLiteDatabase) {
db.execSQL("DROP TABLE IF EXISTS capabilities")

db.execSQL(
"""
CREATE TABLE IF NOT EXISTS capabilities (
_id INTEGER PRIMARY KEY AUTOINCREMENT,
account TEXT,
version_mayor INTEGER,
version_minor INTEGER,
version_micro INTEGER,
version_string TEXT,
version_edition TEXT,
extended_support INTEGER,
core_pollinterval INTEGER,
sharing_api_enabled INTEGER,
sharing_public_enabled INTEGER,
sharing_public_password_enforced INTEGER,
sharing_public_ask_for_optional_password INTEGER,
sharing_public_expire_date_enabled INTEGER,
sharing_public_expire_date_days INTEGER,
sharing_public_expire_date_enforced INTEGER,
sharing_public_send_mail INTEGER,
sharing_public_upload INTEGER,
sharing_user_send_mail INTEGER,
sharing_resharing INTEGER,
sharing_federation_outgoing INTEGER,
sharing_federation_incoming INTEGER,
files_bigfilechunking INTEGER,
files_undelete INTEGER,
files_versioning INTEGER,
files_locking_version TEXT,
external_links INTEGER,
server_name TEXT,
server_color TEXT,
server_text_color TEXT,
server_element_color TEXT,
background_url TEXT,
server_slogan TEXT,
server_logo TEXT,
background_default INTEGER,
background_plain INTEGER,
end_to_end_encryption INTEGER,
end_to_end_encryption_keys_exist INTEGER,
end_to_end_encryption_api_version TEXT,
activity INTEGER,
richdocument INTEGER,
recommendation INTEGER,
richdocument_mimetype_list TEXT,
richdocument_optional_mimetype_list TEXT,
richdocument_direct_editing INTEGER,
richdocument_direct_templates INTEGER,
richdocument_product_name TEXT,
direct_editing_etag TEXT,
etag TEXT,
user_status INTEGER,
user_status_supports_emoji INTEGER,
user_status_supports_busy INTEGER,
assistant INTEGER,
groupfolders INTEGER,
drop_account INTEGER,
security_guard INTEGER,
governance INTEGER,
forbidden_filename_characters TEXT,
forbidden_filenames TEXT,
forbidden_filename_extensions TEXT,
forbidden_filename_basenames TEXT,
windows_compatible_filenames INTEGER,
files_download_limit INTEGER,
files_download_limit_default INTEGER,
notes_folder_path TEXT,
default_permissions INTEGER,
has_valid_subscription INTEGER,
client_integration_json TEXT
)
""".trimIndent()
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import com.nextcloud.receiver.NetworkChangeReceiver;
import com.nextcloud.ui.ChooseAccountDialogFragment;
import com.nextcloud.ui.ChooseStorageLocationDialogFragment;
import com.nextcloud.ui.ImageDetailFragment;
import com.nextcloud.ui.fileInfo.FileInfoFragment;
import com.nextcloud.ui.SetOnlineStatusBottomSheet;
import com.nextcloud.ui.SetStatusMessageBottomSheet;
import com.nextcloud.ui.composeActivity.ComposeActivity;
Expand Down Expand Up @@ -487,7 +487,7 @@ abstract class ComponentsModule {
abstract EditImageActivity editImageActivity();

@ContributesAndroidInjector
abstract ImageDetailFragment imageDetailFragment();
abstract FileInfoFragment fileInfoFragment();

@ContributesAndroidInjector
abstract EtmBackgroundJobsFragment etmBackgroundJobsFragment();
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/com/nextcloud/client/di/ViewModelModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider
import com.nextcloud.client.documentscan.DocumentScanViewModel
import com.nextcloud.client.etm.EtmViewModel
import com.nextcloud.client.logger.ui.LogsViewModel
import com.nextcloud.ui.fileInfo.FileInfoViewModel
import com.nextcloud.ui.fileactions.FileActionsViewModel
import com.owncloud.android.ui.preview.pdf.PreviewPdfViewModel
import com.nextcloud.ui.trashbinFileActions.TrashbinFileActionsViewModel
Expand Down Expand Up @@ -57,6 +58,11 @@ abstract class ViewModelModule {
@ViewModelKey(TrashbinFileActionsViewModel::class)
abstract fun trashbinFileActionsViewModel(vm: TrashbinFileActionsViewModel): ViewModel

@Binds
@IntoMap
@ViewModelKey(FileInfoViewModel::class)
abstract fun fileInfoViewModel(vm: FileInfoViewModel): ViewModel

@Binds
abstract fun bindViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory
}
Loading