From d83844fe1f1323b2e3c4178db2029e0ec56636b3 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Fri, 12 Jan 2024 14:33:08 +0100 Subject: [PATCH] Fix imports Signed-off-by: alperozturk --- .../client/files/download/DownloaderServiceTest.kt | 2 +- .../nextcloud/client/files/download/RegistryTest.kt | 4 ++-- .../files/download/TransferManagerConnectionTest.kt | 10 +++++----- .../client/files/download/TransferManagerTest.kt | 9 +++++---- .../java/com/owncloud/android/AbstractIT.java | 2 +- .../java/com/owncloud/android/AbstractOnServerIT.java | 2 +- .../java/com/owncloud/android/UploadIT.java | 2 +- .../com/owncloud/android/files/FileMenuFilterIT.kt | 4 ++-- .../owncloud/android/files/services/FileUploaderIT.kt | 4 ++-- .../com/owncloud/android/ui/helpers/UriUploaderIT.kt | 2 +- .../com/owncloud/android/ui/activity/FileActivity.java | 1 - .../android/ui/helpers/FileOperationsHelper.java | 1 - .../android/ui/activity/SyncedFoldersActivityTest.java | 2 +- .../owncloud/android/ui/adapter/GalleryAdapterTest.kt | 2 +- 14 files changed, 23 insertions(+), 24 deletions(-) diff --git a/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt index a1b621443b..c8ac3c05e8 100644 --- a/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt +++ b/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt @@ -22,7 +22,7 @@ package com.nextcloud.client.files.download import androidx.test.core.app.ApplicationProvider.getApplicationContext import androidx.test.rule.ServiceTestRule import com.nextcloud.client.account.MockUser -import com.nextcloud.client.files.transfer.FileTransferService +import com.nextcloud.client.jobs.transfer.FileTransferService import io.mockk.MockKAnnotations import org.junit.Assert.assertTrue import org.junit.Before diff --git a/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt index 14f543c2cd..a7231fb52d 100644 --- a/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt +++ b/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt @@ -23,8 +23,8 @@ import com.nextcloud.client.account.User import com.nextcloud.client.files.DownloadRequest import com.nextcloud.client.files.Registry import com.nextcloud.client.files.Request -import com.nextcloud.client.files.transfer.Transfer -import com.nextcloud.client.files.transfer.TransferState +import com.nextcloud.client.jobs.transfer.Transfer +import com.nextcloud.client.jobs.transfer.TransferState import com.owncloud.android.datamodel.OCFile import io.mockk.CapturingSlot import io.mockk.MockKAnnotations diff --git a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt index 5052c897a3..bbbbd03f40 100644 --- a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt +++ b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt @@ -23,11 +23,11 @@ import android.content.ComponentName import android.content.Context import com.nextcloud.client.account.MockUser import com.nextcloud.client.files.DownloadRequest -import com.nextcloud.client.files.transfer.FileTransferService -import com.nextcloud.client.files.transfer.Transfer -import com.nextcloud.client.files.transfer.TransferManager -import com.nextcloud.client.files.transfer.TransferManagerConnection -import com.nextcloud.client.files.transfer.TransferState +import com.nextcloud.client.jobs.transfer.FileTransferService +import com.nextcloud.client.jobs.transfer.Transfer +import com.nextcloud.client.jobs.transfer.TransferManager +import com.nextcloud.client.jobs.transfer.TransferManagerConnection +import com.nextcloud.client.jobs.transfer.TransferState import com.owncloud.android.datamodel.OCFile import io.mockk.MockKAnnotations import io.mockk.every diff --git a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt index 809970b886..527bda87e3 100644 --- a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt +++ b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt @@ -25,10 +25,11 @@ import com.nextcloud.client.core.ManualAsyncRunner import com.nextcloud.client.core.OnProgressCallback import com.nextcloud.client.files.DownloadRequest import com.nextcloud.client.files.Request -import com.nextcloud.client.files.transfer.Transfer -import com.nextcloud.client.files.transfer.TransferManagerImpl -import com.nextcloud.client.files.transfer.TransferState -import com.nextcloud.client.files.upload.UploadTask +import com.nextcloud.client.jobs.download.DownloadTask +import com.nextcloud.client.jobs.transfer.Transfer +import com.nextcloud.client.jobs.transfer.TransferManagerImpl +import com.nextcloud.client.jobs.transfer.TransferState +import com.nextcloud.client.jobs.upload.UploadTask import com.owncloud.android.datamodel.OCFile import com.owncloud.android.lib.common.OwnCloudClient import io.mockk.MockKAnnotations diff --git a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java index 3a983845ec..ee5515eb2d 100644 --- a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java +++ b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java @@ -21,7 +21,7 @@ import com.nextcloud.client.account.UserAccountManager; import com.nextcloud.client.account.UserAccountManagerImpl; import com.nextcloud.client.device.BatteryStatus; import com.nextcloud.client.device.PowerManagementService; -import com.nextcloud.client.files.upload.FileUploadWorker; +import com.nextcloud.client.jobs.upload.FileUploadWorker; import com.nextcloud.client.network.Connectivity; import com.nextcloud.client.network.ConnectivityService; import com.nextcloud.client.preferences.AppPreferencesImpl; diff --git a/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java index 468ba9f2bd..343938e121 100644 --- a/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java +++ b/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java @@ -13,7 +13,7 @@ import com.nextcloud.client.account.UserAccountManager; import com.nextcloud.client.account.UserAccountManagerImpl; import com.nextcloud.client.device.BatteryStatus; import com.nextcloud.client.device.PowerManagementService; -import com.nextcloud.client.files.upload.FileUploadWorker; +import com.nextcloud.client.jobs.upload.FileUploadWorker; import com.nextcloud.client.network.Connectivity; import com.nextcloud.client.network.ConnectivityService; import com.nextcloud.java.util.Optional; diff --git a/app/src/androidTest/java/com/owncloud/android/UploadIT.java b/app/src/androidTest/java/com/owncloud/android/UploadIT.java index ee162e0b65..087156796a 100644 --- a/app/src/androidTest/java/com/owncloud/android/UploadIT.java +++ b/app/src/androidTest/java/com/owncloud/android/UploadIT.java @@ -24,7 +24,7 @@ package com.owncloud.android; import com.nextcloud.client.account.UserAccountManagerImpl; import com.nextcloud.client.device.BatteryStatus; import com.nextcloud.client.device.PowerManagementService; -import com.nextcloud.client.files.upload.FileUploadWorker; +import com.nextcloud.client.jobs.upload.FileUploadWorker; import com.nextcloud.client.network.Connectivity; import com.nextcloud.client.network.ConnectivityService; import com.owncloud.android.datamodel.OCFile; diff --git a/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt b/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt index 25269d82bd..b65fb7c8e8 100644 --- a/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt @@ -23,8 +23,8 @@ package com.owncloud.android.files import androidx.test.core.app.launchActivity import androidx.test.ext.junit.runners.AndroidJUnit4 import com.nextcloud.client.account.User -import com.nextcloud.client.files.download.FileDownloadWorker -import com.nextcloud.client.files.upload.FileUploadHelper +import com.nextcloud.client.jobs.download.FileDownloadWorker +import com.nextcloud.client.jobs.upload.FileUploadHelper import com.nextcloud.test.TestActivity import com.nextcloud.utils.EditorUtils import com.owncloud.android.AbstractIT diff --git a/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt b/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt index c10c0c87cf..415610f701 100644 --- a/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt @@ -26,8 +26,8 @@ import com.nextcloud.client.account.UserAccountManager import com.nextcloud.client.account.UserAccountManagerImpl import com.nextcloud.client.device.BatteryStatus import com.nextcloud.client.device.PowerManagementService -import com.nextcloud.client.files.upload.FileUploadHelper -import com.nextcloud.client.files.upload.FileUploadWorker +import com.nextcloud.client.jobs.upload.FileUploadHelper +import com.nextcloud.client.jobs.upload.FileUploadWorker import com.nextcloud.client.network.Connectivity import com.nextcloud.client.network.ConnectivityService import com.owncloud.android.AbstractOnServerIT diff --git a/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt index a46b499ffb..7354879b67 100644 --- a/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt @@ -2,7 +2,7 @@ package com.owncloud.android.ui.helpers import android.net.Uri import androidx.test.core.app.launchActivity -import com.nextcloud.client.files.upload.FileUploadWorker +import com.nextcloud.client.jobs.upload.FileUploadWorker import com.nextcloud.test.TestActivity import com.owncloud.android.AbstractIT import org.junit.Assert diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java index ea70eb5957..174f8764eb 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java @@ -43,7 +43,6 @@ import android.text.TextUtils; import com.google.android.material.snackbar.Snackbar; import com.nextcloud.client.account.User; import com.nextcloud.client.account.UserAccountManager; -import com.nextcloud.client.files.uploader.FileUploadHelper; import com.nextcloud.client.jobs.BackgroundJobManager; import com.nextcloud.client.jobs.download.FileDownloadWorker; import com.nextcloud.client.jobs.upload.FileUploadHelper; diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java index ca774c7299..c807000190 100755 --- a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java +++ b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java @@ -47,7 +47,6 @@ import android.webkit.MimeTypeMap; import com.nextcloud.client.account.CurrentAccountProvider; import com.nextcloud.client.account.User; -import com.nextcloud.client.files.uploader.FileUploadHelper; import com.nextcloud.client.jobs.BackgroundJobManager; import com.nextcloud.client.jobs.download.FileDownloadHelper; import com.nextcloud.client.jobs.upload.FileUploadHelper; diff --git a/app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java b/app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java index 73c5e00a6c..37602cdd84 100644 --- a/app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java +++ b/app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java @@ -22,7 +22,7 @@ package com.owncloud.android.ui.activity; -import com.nextcloud.client.files.upload.FileUploadWorker; +import com.nextcloud.client.jobs.upload.FileUploadWorker; import com.nextcloud.client.preferences.SubFolderRule; import com.owncloud.android.datamodel.MediaFolderType; import com.owncloud.android.datamodel.SyncedFolderDisplayItem; diff --git a/app/src/test/java/com/owncloud/android/ui/adapter/GalleryAdapterTest.kt b/app/src/test/java/com/owncloud/android/ui/adapter/GalleryAdapterTest.kt index ffffa18aa2..65dc534945 100644 --- a/app/src/test/java/com/owncloud/android/ui/adapter/GalleryAdapterTest.kt +++ b/app/src/test/java/com/owncloud/android/ui/adapter/GalleryAdapterTest.kt @@ -24,7 +24,7 @@ package com.owncloud.android.ui.adapter import android.content.Context import com.nextcloud.client.account.User -import com.nextcloud.client.files.upload.FileUploadHelper +import com.nextcloud.client.jobs.upload.FileUploadHelper import com.nextcloud.client.preferences.AppPreferences import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.datamodel.GalleryItems