Explorar o código

Remove FileUploader imports

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk hai 1 ano
pai
achega
584bac9ae7

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -170,7 +170,7 @@
             android:name="com.nextcloud.client.jobs.NotificationWork$NotificationReceiver"
             android:name="com.nextcloud.client.jobs.NotificationWork$NotificationReceiver"
             android:exported="false" />
             android:exported="false" />
         <receiver
         <receiver
-            android:name="com.owncloud.android.files.services.FileUploader$UploadNotificationActionReceiver"
+            android:name="com.nextcloud.client.jobs.FilesUploadWorker$Companion$UploadNotificationActionReceiver"
             android:exported="false" />
             android:exported="false" />
         <receiver
         <receiver
             android:name="com.nextcloud.client.widget.DashboardWidgetProvider"
             android:name="com.nextcloud.client.widget.DashboardWidgetProvider"

+ 3 - 3
app/src/main/java/com/nextcloud/client/jobs/FilesUploadWorker.kt

@@ -407,15 +407,15 @@ class FilesUploadWorker(
         }
         }
 
 
         fun getUploadsAddedMessage(): String {
         fun getUploadsAddedMessage(): String {
-            return FileUploader::class.java.name + UPLOADS_ADDED_MESSAGE
+            return FilesUploadWorker::class.java.name + UPLOADS_ADDED_MESSAGE
         }
         }
 
 
         fun getUploadStartMessage(): String {
         fun getUploadStartMessage(): String {
-            return FileUploader::class.java.name + UPLOAD_START_MESSAGE
+            return FilesUploadWorker::class.java.name + UPLOAD_START_MESSAGE
         }
         }
 
 
         fun getUploadFinishMessage(): String {
         fun getUploadFinishMessage(): String {
-            return FileUploader::class.java.name + UPLOAD_FINISH_MESSAGE
+            return FilesUploadWorker::class.java.name + UPLOAD_FINISH_MESSAGE
         }
         }
 
 
         fun buildRemoteName(accountName: String, remotePath: String): String {
         fun buildRemoteName(accountName: String, remotePath: String): String {

+ 4 - 5
app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt

@@ -24,7 +24,6 @@ import android.net.Uri
 import android.os.Parcelable
 import android.os.Parcelable
 import com.nextcloud.client.account.User
 import com.nextcloud.client.account.User
 import com.owncloud.android.R
 import com.owncloud.android.R
-import com.owncloud.android.files.services.FileUploader
 import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.operations.UploadFileOperation
 import com.owncloud.android.operations.UploadFileOperation
@@ -36,16 +35,16 @@ import com.owncloud.android.utils.FilesUploadHelper
 import com.owncloud.android.utils.UriUtils.getDisplayNameForUri
 import com.owncloud.android.utils.UriUtils.getDisplayNameForUri
 
 
 /**
 /**
- * This class examines URIs pointing to files to upload and then requests [FileUploader] to upload them.
+ * This class examines URIs pointing to files to upload and then requests [FilesUploadHelper] to upload them.
  *
  *
  *
  *
- * URIs with scheme file:// do not require any previous processing, their path is sent to [FileUploader] to find
+ * URIs with scheme file:// do not require any previous processing, their path is sent to [FilesUploadHelper] to find
  * the source file.
  * the source file.
  *
  *
  *
  *
  * URIs with scheme content:// are handling assuming that file is in private storage owned by a different app, and that
  * URIs with scheme content:// are handling assuming that file is in private storage owned by a different app, and that
  * persistence permission is not granted. Due to this, contents of the file are temporary copied by the OC app, and then
  * persistence permission is not granted. Due to this, contents of the file are temporary copied by the OC app, and then
- * passed [FileUploader].
+ * passed [FilesUploadHelper].
  */
  */
 @Suppress(
 @Suppress(
     "Detekt.LongParameterList",
     "Detekt.LongParameterList",
@@ -115,7 +114,7 @@ class UriUploader(
     private fun isSensitiveUri(uri: Uri): Boolean = uri.toString().contains(mActivity.packageName)
     private fun isSensitiveUri(uri: Uri): Boolean = uri.toString().contains(mActivity.packageName)
 
 
     /**
     /**
-     * Requests the upload of a file in the local file system to [FileUploader] service.
+     * Requests the upload of a file in the local file system to [FilesUploadHelper] service.
      *
      *
      * The original file will be left in its original location, and will not be duplicated.
      * The original file will be left in its original location, and will not be duplicated.
      * As a side effect, the user will see the file as not uploaded when accesses to the OC app.
      * As a side effect, the user will see the file as not uploaded when accesses to the OC app.

+ 0 - 1
app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java

@@ -43,7 +43,6 @@ import com.owncloud.android.datamodel.SyncedFolder;
 import com.owncloud.android.datamodel.SyncedFolderProvider;
 import com.owncloud.android.datamodel.SyncedFolderProvider;
 import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.db.OCUpload;
-import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 
 import org.lukhnos.nnio.file.FileVisitResult;
 import org.lukhnos.nnio.file.FileVisitResult;

+ 0 - 1
app/src/main/java/com/owncloud/android/utils/FilesUploadHelper.kt

@@ -29,7 +29,6 @@ import com.owncloud.android.MainApp
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.UploadsStorageManager
 import com.owncloud.android.datamodel.UploadsStorageManager
 import com.owncloud.android.db.OCUpload
 import com.owncloud.android.db.OCUpload
-import com.owncloud.android.files.services.FileUploader.FileUploaderBinder
 import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.common.utils.Log_OC