Skip to content

refactor(document-storage-provider): kotlin #17910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 8 commits into from
Oct 30, 2026
+1,460 −1,255
Merged

refactor(document-storage-provider): kotlin #17910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
020edd6
Rename .java to .kt
alperozturk96 Oct 29, 2026
ed2bfb4
refactor(document-storage-provider): kotlin
alperozturk96 Oct 29, 2026
528bd1f
restructure package
alperozturk96 Oct 29, 2026
ecefd79
optimize imports
alperozturk96 Oct 29, 2026
60be504
use injections
alperozturk96 Oct 29, 2026
722823c
Rename .java to .kt
alperozturk96 Oct 30, 2026
93d1eeb
fix spotbugs and convert cursor implm to kotlin
alperozturk96 Oct 30, 2026
84122f2
wip
alperozturk96 Oct 30, 2026
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
4 changes: 2 additions & 2 deletions ...droid/providers/DocumentsProviderUtils.kt → ...documentstorage/DocumentsProviderUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-FileCopyrightText: 2020 Torsten Grote <t@grobox.de>
* SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
*/
package com.owncloud.android.providers
package com.owncloud.android.providers.documentstorage

import android.content.Context
import android.database.ContentObserver
Expand All @@ -25,7 +25,7 @@ import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.lib.common.OwnCloudClient
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation
import com.owncloud.android.providers.DocumentsStorageProvider.DOCUMENTID_SEPARATOR
import com.owncloud.android.providers.documentstorage.DocumentsStorageProvider.Companion.DOCUMENTID_SEPARATOR
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.TimeoutCancellationException
import kotlinx.coroutines.suspendCancellableCoroutine
Expand Down
22 changes: 11 additions & 11 deletions ...d/providers/DocumentsStorageProviderIT.kt → ...mentstorage/DocumentsStorageProviderIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-FileCopyrightText: 2020 Torsten Grote <t@grobox.de>
* SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
*/
package com.owncloud.android.providers
package com.owncloud.android.providers.documentstorage

import android.provider.DocumentsContract
import androidx.documentfile.provider.DocumentFile
Expand All @@ -20,16 +20,16 @@ import com.owncloud.android.datamodel.UploadsStorageManager.UploadStatus
import com.owncloud.android.db.OCUpload
import com.owncloud.android.db.UploadResult
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.providers.DocumentsProviderUtils.assertExistsOnServer
import com.owncloud.android.providers.DocumentsProviderUtils.assertListFilesEquals
import com.owncloud.android.providers.DocumentsProviderUtils.assertReadEquals
import com.owncloud.android.providers.DocumentsProviderUtils.assertRecentlyModified
import com.owncloud.android.providers.DocumentsProviderUtils.assertRegularFile
import com.owncloud.android.providers.DocumentsProviderUtils.assertRegularFolder
import com.owncloud.android.providers.DocumentsProviderUtils.findFileBlocking
import com.owncloud.android.providers.DocumentsProviderUtils.getOCFile
import com.owncloud.android.providers.DocumentsProviderUtils.listFilesBlocking
import com.owncloud.android.providers.DocumentsStorageProvider.DOCUMENTID_SEPARATOR
import com.owncloud.android.providers.documentstorage.DocumentsProviderUtils.assertExistsOnServer
import com.owncloud.android.providers.documentstorage.DocumentsProviderUtils.assertListFilesEquals
import com.owncloud.android.providers.documentstorage.DocumentsProviderUtils.assertReadEquals
import com.owncloud.android.providers.documentstorage.DocumentsProviderUtils.assertRecentlyModified
import com.owncloud.android.providers.documentstorage.DocumentsProviderUtils.assertRegularFile
import com.owncloud.android.providers.documentstorage.DocumentsProviderUtils.assertRegularFolder
import com.owncloud.android.providers.documentstorage.DocumentsProviderUtils.findFileBlocking
import com.owncloud.android.providers.documentstorage.DocumentsProviderUtils.getOCFile
import com.owncloud.android.providers.documentstorage.DocumentsProviderUtils.listFilesBlocking
import com.owncloud.android.providers.documentstorage.DocumentsStorageProvider.Companion.DOCUMENTID_SEPARATOR
import kotlinx.coroutines.runBlocking
import org.apache.commons.httpclient.HttpStatus
import org.apache.commons.httpclient.methods.ByteArrayRequestEntity
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@
android:exported="false"
android:label="@string/share_search" />
<provider
android:name=".providers.DocumentsStorageProvider"
android:name=".providers.documentstorage.DocumentsStorageProvider"
android:authorities="@string/document_provider_authority"
android:enabled="true"
android:exported="true"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/nextcloud/client/di/AppModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.nextcloud.client.core.ThreadPoolAsyncRunner
import com.nextcloud.client.database.dao.ArbitraryDataDao
import com.nextcloud.client.device.DeviceInfo
import com.nextcloud.client.jobs.operation.FileOperationHelper
import com.nextcloud.client.jobs.upload.FileUploadHelper
import com.nextcloud.client.logger.FileLogHandler
import com.nextcloud.client.logger.Logger
import com.nextcloud.client.logger.LoggerImpl
Expand Down Expand Up @@ -119,6 +120,9 @@ internal class AppModule {
@Provides
fun clientRepository(repository: RemoteClientRepository): ClientRepository = repository

@Provides
fun fileUploadHelper(): FileUploadHelper = FileUploadHelper.instance()

@Provides
fun uploadsStorageManager(currentAccountProvider: CurrentAccountProvider, context: Context): UploadsStorageManager =
UploadsStorageManager(currentAccountProvider, context.contentResolver)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/nextcloud/client/di/ComponentsModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import com.owncloud.android.authentication.AuthenticatorActivity
import com.owncloud.android.authentication.DeepLinkLoginActivity
import com.owncloud.android.files.BootupBroadcastReceiver
import com.owncloud.android.providers.DiskLruImageCacheFileProvider
import com.owncloud.android.providers.DocumentsStorageProvider
import com.owncloud.android.providers.documentstorage.DocumentsStorageProvider
import com.owncloud.android.providers.FileContentProvider
import com.owncloud.android.providers.UsersAndGroupsSearchProvider
import com.owncloud.android.services.AccountManagerService
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/nextcloud/client/jobs/AccountRemovalWork.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.lib.resources.users.DeleteAppPasswordRemoteOperation
import com.owncloud.android.lib.resources.users.RemoteWipeSuccessRemoteOperation
import com.owncloud.android.providers.DocumentsStorageProvider
import com.owncloud.android.providers.documentstorage.DocumentsStorageProvider
import com.owncloud.android.ui.activity.ContactsPreferenceActivity
import com.owncloud.android.ui.activity.ManageAccountsActivity
import com.owncloud.android.ui.events.AccountRemovedEvent
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/owncloud/android/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import com.owncloud.android.lib.resources.status.NextcloudVersion;
import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
import com.owncloud.android.providers.documentstorage.DocumentsStorageProvider;
import com.owncloud.android.ui.navigation.NavigatorActivity;
import com.owncloud.android.ui.navigation.NavigatorScreen;
import com.owncloud.android.ui.notifications.NotificationUtils;
Expand Down Expand Up @@ -373,7 +374,7 @@ public void onCreate() {

public void disableDocumentsStorageProvider() {
String packageName = getPackageName();
String providerClassName = "com.owncloud.android.providers.DocumentsStorageProvider";
String providerClassName = DocumentsStorageProvider.class.getName();
ComponentName componentName = new ComponentName(packageName, providerClassName);
PackageManager packageManager = getPackageManager();
packageManager.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ import com.owncloud.android.operations.DetectAuthenticationMethodOperation.Authe
import com.owncloud.android.operations.GetCapabilitiesOperation
import com.owncloud.android.operations.GetServerInfoOperation
import com.owncloud.android.operations.GetServerInfoOperation.ServerInfo
import com.owncloud.android.providers.DocumentsStorageProvider
import com.owncloud.android.providers.documentstorage.DocumentsStorageProvider
import com.owncloud.android.services.OperationsService
import com.owncloud.android.services.OperationsService.OperationsServiceBinder
import com.owncloud.android.ui.activity.FileDisplayActivity
Expand Down
Loading
Loading