Skip to content

Commit 57296e0

Browse files
alperozturk96alperozturk96
committed
update calls
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent d2b7189 commit 57296e0

7 files changed

Lines changed: 116 additions & 139 deletions

File tree

‎app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.nextcloud.client.account.UserAccountManager
1818
import com.nextcloud.client.database.entity.toOCUpload
1919
import com.nextcloud.client.database.entity.toUploadEntity
2020
import com.nextcloud.client.device.PowerManagementService
21-
import com.nextcloud.client.jobs.upload.FileUploadBroadcastManager
21+
import com.nextcloud.client.jobs.upload.FileUploadEventBroadcaster
2222
import com.nextcloud.client.jobs.upload.FileUploadWorker
2323
import com.nextcloud.client.jobs.utils.UploadErrorNotificationManager
2424
import com.nextcloud.client.network.ConnectivityService
@@ -70,7 +70,7 @@ class AutoUploadWorker(
7070
}
7171

7272
private val syncFolderHelper = SyncFolderHelper(context)
73-
private val fileUploadBroadcastManager = FileUploadBroadcastManager(localBroadcastManager)
73+
private val fileUploadEventBroadcaster = FileUploadEventBroadcaster(localBroadcastManager)
7474
private lateinit var syncedFolder: SyncedFolder
7575
private val notificationManager = AutoUploadNotificationManager(context, viewThemeUtils, NOTIFICATION_ID)
7676

@@ -287,12 +287,12 @@ class AutoUploadWorker(
287287
uploadEntity = uploadEntity.copy(id = generatedId.toInt())
288288
upload.uploadId = generatedId
289289

290-
fileUploadBroadcastManager.sendAdded(context)
290+
fileUploadEventBroadcaster.sendUploadEnqueued(context)
291291
val operation = createUploadFileOperation(upload, user)
292292
Log_OC.d(TAG, "🕒 uploading: $localPath, id: $generatedId")
293293

294294
val result = operation.execute(client)
295-
fileUploadBroadcastManager.sendStarted(operation, context)
295+
fileUploadEventBroadcaster.sendUploadStarted(operation, context)
296296

297297
UploadErrorNotificationManager.handleResult(
298298
context,
@@ -427,7 +427,7 @@ class AutoUploadWorker(
427427
)
428428

429429
private fun sendUploadFinishEvent(operation: UploadFileOperation, result: RemoteOperationResult<*>) {
430-
fileUploadBroadcastManager.sendFinished(
430+
fileUploadEventBroadcaster.sendUploadCompleted(
431431
operation,
432432
result,
433433
context

‎app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadEventBroadcaster.kt‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class FileDownloadEventBroadcaster(private val context: Context, private val bro
2525

2626
const val EXTRA_DOWNLOAD_RESULT = PREFIX + "EXTRA_DOWNLOAD_RESULT"
2727
const val EXTRA_REMOTE_PATH = PREFIX + "EXTRA_REMOTE_PATH"
28-
const val EXTRA_LINKED_TO_PATH = PREFIX + "EXTRA_LINKED_TO_PATH"
2928
const val EXTRA_ACCOUNT_NAME = PREFIX + "EXTRA_ACCOUNT_NAME"
3029
const val EXTRA_CURRENT_DOWNLOAD_ACCOUNT_NAME = PREFIX + "EXTRA_CURRENT_DOWNLOAD_ACCOUNT_NAME"
3130
const val EXTRA_CURRENT_DOWNLOAD_FILE_ID = PREFIX + "EXTRA_CURRENT_DOWNLOAD_FILE_ID"
@@ -39,7 +38,6 @@ class FileDownloadEventBroadcaster(private val context: Context, private val bro
3938
remotePath: String,
4039
packageName: String,
4140
fileId: Long?,
42-
linkedToRemotePath: String?,
4341
currentDownloadAccountName: String?
4442
) {
4543
Log_OC.d(TAG, "Download enqueued broadcast sent")
@@ -55,21 +53,13 @@ class FileDownloadEventBroadcaster(private val context: Context, private val bro
5553
currentDownloadAccountName?.let {
5654
putExtra(EXTRA_CURRENT_DOWNLOAD_ACCOUNT_NAME, currentDownloadAccountName)
5755
}
58-
59-
linkedToRemotePath?.let {
60-
putExtra(EXTRA_LINKED_TO_PATH, linkedToRemotePath)
61-
}
6256
setPackage(packageName)
6357
}
6458

6559
broadcastManager.sendBroadcast(intent)
6660
}
6761

68-
fun sendDownloadCompleted(
69-
download: DownloadFileOperation,
70-
downloadResult: RemoteOperationResult<*>,
71-
unlinkedFromRemotePath: String?
72-
) {
62+
fun sendDownloadCompleted(download: DownloadFileOperation, downloadResult: RemoteOperationResult<*>) {
7363
Log_OC.d(TAG, "Download completed broadcast sent")
7464

7565
val intent = Intent(ACTION_DOWNLOAD_COMPLETED).apply {
@@ -79,9 +69,6 @@ class FileDownloadEventBroadcaster(private val context: Context, private val bro
7969
putExtra(EXTRA_DOWNLOAD_BEHAVIOUR, download.behaviour)
8070
putExtra(EXTRA_ACTIVITY_NAME, download.activityName)
8171
putExtra(EXTRA_PACKAGE_NAME, download.packageName)
82-
if (unlinkedFromRemotePath != null) {
83-
putExtra(EXTRA_LINKED_TO_PATH, unlinkedFromRemotePath)
84-
}
8572
setPackage(context.packageName)
8673
}
8774

‎app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class FileDownloadWorker(
189189

190190
operation.addDownloadDataTransferProgressListener(this)
191191
operation.addDownloadDataTransferProgressListener(downloadProgressListener)
192-
val (downloadKey, linkedToRemotePath) = pendingDownloads.putIfAbsent(
192+
val (downloadKey, _) = pendingDownloads.putIfAbsent(
193193
user?.accountName,
194194
file.remotePath,
195195
operation
@@ -204,7 +204,6 @@ class FileDownloadWorker(
204204
operation.remotePath,
205205
context.packageName,
206206
operation.file.fileId,
207-
linkedToRemotePath,
208207
operation.user.accountName
209208
)
210209
}
@@ -331,8 +330,7 @@ class FileDownloadWorker(
331330

332331
fileDownloadEventBroadcaster.sendDownloadCompleted(
333332
this,
334-
downloadResult,
335-
removeResult.second
333+
downloadResult
336334
)
337335
}
338336
}

‎app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadEventBroadcaster.kt‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,22 @@ import com.owncloud.android.operations.UploadFileOperation
2222
*
2323
* All broadcasts are sent via [LocalBroadcastManager].
2424
*/
25-
class FileUploadBroadcastManager(private val broadcastManager: LocalBroadcastManager) {
25+
class FileUploadEventBroadcaster(private val broadcastManager: LocalBroadcastManager) {
2626

2727
companion object {
2828
private const val TAG = "📣" + "FileUploadBroadcastManager"
2929

30-
const val UPLOAD_ADDED = "UPLOAD_ADDED"
31-
const val UPLOAD_STARTED = "UPLOAD_STARTED"
32-
const val UPLOAD_FINISHED = "UPLOAD_FINISHED"
30+
private const val PREFIX = "com.nextcloud.client.upload."
31+
32+
const val ACTION_UPLOAD_ENQUEUED = PREFIX + "ACTION_UPLOAD_ENQUEUED"
33+
const val ACTION_UPLOAD_STARTED = PREFIX + "ACTION_UPLOAD_STARTED"
34+
const val ACTION_UPLOAD_COMPLETED = PREFIX + "UPLOAD_FINISHED"
35+
36+
const val EXTRA_REMOTE_PATH = PREFIX + "EXTRA_REMOTE_PATH"
37+
const val EXTRA_OLD_FILE_PATH = PREFIX + "EXTRA_OLD_FILE_PATH"
38+
const val EXTRA_ACCOUNT_NAME = PREFIX + "EXTRA_ACCOUNT_NAME"
39+
const val EXTRA_OLD_REMOTE_PATH = PREFIX + "EXTRA_OLD_REMOTE_PATH"
40+
const val EXTRA_UPLOAD_RESULT = PREFIX + "EXTRA_UPLOAD_RESULT"
3341
}
3442

3543
/**
@@ -42,9 +50,10 @@ class FileUploadBroadcastManager(private val broadcastManager: LocalBroadcastMan
4250
* - [com.owncloud.android.ui.activity.UploadListActivity.UploadFinishReceiver]
4351
*
4452
*/
45-
fun sendAdded(context: Context) {
46-
Log_OC.d(TAG, "upload added broadcast sent")
47-
val intent = Intent(UPLOAD_ADDED).apply {
53+
fun sendUploadEnqueued(context: Context) {
54+
Log_OC.d(TAG, "Upload enqueued broadcast sent")
55+
56+
val intent = Intent(ACTION_UPLOAD_ENQUEUED).apply {
4857
setPackage(context.packageName)
4958
}
5059
broadcastManager.sendBroadcast(intent)
@@ -60,12 +69,13 @@ class FileUploadBroadcastManager(private val broadcastManager: LocalBroadcastMan
6069
* - [com.owncloud.android.ui.activity.UploadListActivity.UploadFinishReceiver]
6170
*
6271
*/
63-
fun sendStarted(upload: UploadFileOperation, context: Context) {
64-
Log_OC.d(TAG, "upload started broadcast sent")
65-
val intent = Intent(UPLOAD_STARTED).apply {
66-
putExtra(FileUploadWorker.EXTRA_REMOTE_PATH, upload.remotePath) // real remote
67-
putExtra(FileUploadWorker.EXTRA_OLD_FILE_PATH, upload.originalStoragePath)
68-
putExtra(FileUploadWorker.ACCOUNT_NAME, upload.user.accountName)
72+
fun sendUploadStarted(upload: UploadFileOperation, context: Context) {
73+
Log_OC.d(TAG, "Upload started broadcast sent")
74+
75+
val intent = Intent(ACTION_UPLOAD_STARTED).apply {
76+
putExtra(EXTRA_REMOTE_PATH, upload.remotePath) // real remote
77+
putExtra(EXTRA_OLD_FILE_PATH, upload.originalStoragePath)
78+
putExtra(EXTRA_ACCOUNT_NAME, upload.user.accountName)
6979
setPackage(context.packageName)
7080
}
7181
broadcastManager.sendBroadcast(intent)
@@ -79,24 +89,24 @@ class FileUploadBroadcastManager(private val broadcastManager: LocalBroadcastMan
7989
* - [UploadFileOperation] completes execution
8090
*
8191
* ### Observed by
82-
* - [com.owncloud.android.ui.activity.FileDisplayActivity.UploadFinishReceiver]
92+
* - [com.owncloud.android.ui.activity.FileDisplayActivity.FileUploadCompletedReceiver]
8393
* - [com.owncloud.android.ui.activity.UploadListActivity.UploadFinishReceiver]
84-
* - [com.owncloud.android.ui.preview.PreviewImageActivity.UploadFinishReceiver]
8594
*
8695
*/
87-
fun sendFinished(upload: UploadFileOperation, uploadResult: RemoteOperationResult<*>, context: Context) {
88-
Log_OC.d(TAG, "upload finished broadcast sent")
89-
val intent = Intent(UPLOAD_FINISHED).apply {
96+
fun sendUploadCompleted(upload: UploadFileOperation, uploadResult: RemoteOperationResult<*>, context: Context) {
97+
Log_OC.d(TAG, "Upload completed broadcast sent")
98+
99+
val intent = Intent(ACTION_UPLOAD_COMPLETED).apply {
90100
// real remote path, after possible automatic renaming
91-
putExtra(FileUploadWorker.EXTRA_REMOTE_PATH, upload.remotePath)
101+
putExtra(EXTRA_REMOTE_PATH, upload.remotePath)
92102
if (upload.wasRenamed()) {
93103
upload.oldFile?.let {
94-
putExtra(FileUploadWorker.EXTRA_OLD_REMOTE_PATH, it.remotePath)
104+
putExtra(EXTRA_OLD_REMOTE_PATH, it.remotePath)
95105
}
96106
}
97-
putExtra(FileUploadWorker.EXTRA_OLD_FILE_PATH, upload.originalStoragePath)
98-
putExtra(FileUploadWorker.ACCOUNT_NAME, upload.user.accountName)
99-
putExtra(FileUploadWorker.EXTRA_UPLOAD_RESULT, uploadResult.isSuccess)
107+
putExtra(EXTRA_OLD_FILE_PATH, upload.originalStoragePath)
108+
putExtra(EXTRA_ACCOUNT_NAME, upload.user.accountName)
109+
putExtra(EXTRA_UPLOAD_RESULT, uploadResult.isSuccess)
100110
setPackage(context.packageName)
101111
}
102112
broadcastManager.sendBroadcast(intent)

‎app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ class FileUploadWorker(
7777

7878
private const val BATCH_SIZE = 100
7979

80-
const val EXTRA_UPLOAD_RESULT = "RESULT"
81-
const val EXTRA_REMOTE_PATH = "REMOTE_PATH"
82-
const val EXTRA_OLD_REMOTE_PATH = "OLD_REMOTE_PATH"
83-
const val EXTRA_OLD_FILE_PATH = "OLD_FILE_PATH"
84-
const val ACCOUNT_NAME = "ACCOUNT_NAME"
8580
const val EXTRA_ACCOUNT_NAME = "ACCOUNT_NAME"
8681
const val ACTION_CANCEL_BROADCAST = "CANCEL"
8782
const val LOCAL_BEHAVIOUR_COPY = 0
@@ -118,7 +113,7 @@ class FileUploadWorker(
118113
private val notificationId = Random.nextInt()
119114
private val notificationManager = UploadNotificationManager(context, viewThemeUtils, notificationId)
120115
private val intents = FileUploaderIntents(context)
121-
private val fileUploadBroadcastManager = FileUploadBroadcastManager(localBroadcastManager)
116+
private val fileUploadEventBroadcaster = FileUploadEventBroadcaster(localBroadcastManager)
122117

123118
override suspend fun doWork(): Result = try {
124119
trySetForeground()
@@ -241,7 +236,7 @@ class FileUploadWorker(
241236
return@withContext Result.failure()
242237
}
243238

244-
fileUploadBroadcastManager.sendAdded(context)
239+
fileUploadEventBroadcaster.sendUploadEnqueued(context)
245240
val operation = createUploadFileOperation(upload, user)
246241
currentUploadFileOperation = operation
247242

@@ -284,7 +279,7 @@ class FileUploadWorker(
284279
isLastUpload
285280

286281
if (shouldBroadcast) {
287-
fileUploadBroadcastManager.sendFinished(
282+
fileUploadEventBroadcaster.sendUploadCompleted(
288283
operation,
289284
result,
290285
context
@@ -340,7 +335,7 @@ class FileUploadWorker(
340335
val file = File(operation.originalStoragePath)
341336
val remoteId: String? = operation.file.remoteId
342337
task.execute(ThumbnailsCacheManager.ThumbnailGenerationTaskObject(file, remoteId))
343-
fileUploadBroadcastManager.sendStarted(operation, context)
338+
fileUploadEventBroadcaster.sendUploadStarted(operation, context)
344339
} catch (e: Exception) {
345340
Log_OC.e(TAG, "Error uploading", e)
346341
uploadsStorageManager.run {

‎app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ public void add(Account account, String remotePath,
128128
remotePath,
129129
mService.getPackageName(),
130130
syncFolderOperation.getFolderId(),
131-
null,
132131
syncFolderOperation.getAccountName());
133132
}
134133
}

0 commit comments

Comments
 (0)