Browse Source

Fix imports

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 year ago
parent
commit
d83844fe1f

+ 1 - 1
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

+ 2 - 2
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

+ 5 - 5
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

+ 5 - 4
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

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 2 - 2
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

+ 2 - 2
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

+ 1 - 1
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

+ 0 - 1
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;

+ 0 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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