Skip to content

Commit 0280e4b

Browse files
alperozturk96alperozturk96
committed
use consistent names, argument
Signed-off-by: alperozturk96 <alper_ozturk@proton.me> # Conflicts: # app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt # app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadEventBroadcaster.kt # app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt # app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
1 parent 239170e commit 0280e4b

13 files changed

Lines changed: 166 additions & 171 deletions

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

Lines changed: 0 additions & 101 deletions
This file was deleted.

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

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
/*
2+
* Nextcloud - Android Client
3+
*
4+
* SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
5+
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH
6+
* SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
7+
*/
8+
package com.nextcloud.client.jobs.download
9+
10+
import android.content.Context
11+
import android.content.Intent
12+
import androidx.localbroadcastmanager.content.LocalBroadcastManager
13+
import com.owncloud.android.lib.common.operations.RemoteOperationResult
14+
import com.owncloud.android.lib.common.utils.Log_OC
15+
import com.owncloud.android.operations.DownloadFileOperation
16+
17+
class FileDownloadEventBroadcaster(private val context: Context, private val broadcastManager: LocalBroadcastManager) {
18+
companion object {
19+
private const val TAG = "📣" + "FileDownloadBroadcastManager"
20+
21+
private const val ARG_PREFIX = "com.nextcloud.client.download."
22+
23+
const val ACTION_DOWNLOAD_ENQUEUED = ARG_PREFIX + "ACTION_DOWNLOAD_ENQUEUED"
24+
const val ACTION_DOWNLOAD_COMPLETED = ARG_PREFIX + "ACTION_DOWNLOAD_COMPLETED"
25+
26+
const val EXTRA_DOWNLOAD_RESULT = ARG_PREFIX + "EXTRA_DOWNLOAD_RESULT"
27+
const val EXTRA_REMOTE_PATH = ARG_PREFIX + "EXTRA_REMOTE_PATH"
28+
const val EXTRA_LINKED_TO_PATH = ARG_PREFIX + "EXTRA_LINKED_TO_PATH"
29+
const val EXTRA_ACCOUNT_NAME = ARG_PREFIX + "EXTRA_ACCOUNT_NAME"
30+
const val EXTRA_CURRENT_DOWNLOAD_ACCOUNT_NAME = ARG_PREFIX + "EXTRA_CURRENT_DOWNLOAD_ACCOUNT_NAME"
31+
const val EXTRA_CURRENT_DOWNLOAD_FILE_ID = ARG_PREFIX + "EXTRA_CURRENT_DOWNLOAD_FILE_ID"
32+
const val EXTRA_PACKAGE_NAME = ARG_PREFIX + "PACKAGE_NAME"
33+
const val EXTRA_ACTIVITY_NAME = ARG_PREFIX + "ACTIVITY_NAME"
34+
const val EXTRA_DOWNLOAD_BEHAVIOUR = ARG_PREFIX + "DOWNLOAD_BEHAVIOUR"
35+
}
36+
37+
fun sendDownloadEnqueued(
38+
accountName: String,
39+
remotePath: String,
40+
packageName: String,
41+
fileId: Long?,
42+
linkedToRemotePath: String?,
43+
currentDownloadAccountName: String?
44+
) {
45+
Log_OC.d(TAG, "Download enqueued broadcast sent")
46+
47+
val intent = Intent(ACTION_DOWNLOAD_ENQUEUED).apply {
48+
putExtra(EXTRA_ACCOUNT_NAME, accountName)
49+
putExtra(EXTRA_REMOTE_PATH, remotePath)
50+
51+
fileId?.let {
52+
putExtra(EXTRA_CURRENT_DOWNLOAD_FILE_ID, fileId)
53+
}
54+
55+
currentDownloadAccountName?.let {
56+
putExtra(EXTRA_CURRENT_DOWNLOAD_ACCOUNT_NAME, currentDownloadAccountName)
57+
}
58+
59+
linkedToRemotePath?.let {
60+
putExtra(EXTRA_LINKED_TO_PATH, linkedToRemotePath)
61+
}
62+
setPackage(packageName)
63+
}
64+
65+
broadcastManager.sendBroadcast(intent)
66+
}
67+
68+
fun sendDownloadCompleted(
69+
download: DownloadFileOperation,
70+
downloadResult: RemoteOperationResult<*>,
71+
unlinkedFromRemotePath: String?
72+
) {
73+
Log_OC.d(TAG, "Download completed broadcast sent")
74+
75+
val intent = Intent(ACTION_DOWNLOAD_COMPLETED).apply {
76+
putExtra(EXTRA_DOWNLOAD_RESULT, downloadResult.isSuccess)
77+
putExtra(EXTRA_ACCOUNT_NAME, download.user.accountName)
78+
putExtra(EXTRA_REMOTE_PATH, download.remotePath)
79+
putExtra(EXTRA_DOWNLOAD_BEHAVIOUR, download.behaviour)
80+
putExtra(EXTRA_ACTIVITY_NAME, download.activityName)
81+
putExtra(EXTRA_PACKAGE_NAME, download.packageName)
82+
if (unlinkedFromRemotePath != null) {
83+
putExtra(EXTRA_LINKED_TO_PATH, unlinkedFromRemotePath)
84+
}
85+
setPackage(context.packageName)
86+
}
87+
88+
broadcastManager.sendBroadcast(intent)
89+
}
90+
91+
fun sendDownloadCompleted(accountName: String, remotePath: String?, packageName: String, success: Boolean) {
92+
Log_OC.d(TAG, "Download completed broadcast sent")
93+
94+
val intent = Intent(ACTION_DOWNLOAD_COMPLETED).apply {
95+
putExtra(EXTRA_ACCOUNT_NAME, accountName)
96+
putExtra(EXTRA_REMOTE_PATH, remotePath)
97+
putExtra(EXTRA_DOWNLOAD_RESULT, success)
98+
setPackage(packageName)
99+
}
100+
101+
broadcastManager.sendBroadcast(intent)
102+
}
103+
}

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,14 @@ class FileDownloadWorker(
7777
const val ACTIVITY_NAME = "ACTIVITY_NAME"
7878
const val PACKAGE_NAME = "PACKAGE_NAME"
7979
const val CONFLICT_UPLOAD_ID = "CONFLICT_UPLOAD_ID"
80-
const val EXTRA_DOWNLOAD_RESULT = "EXTRA_DOWNLOAD_RESULT"
81-
const val EXTRA_REMOTE_PATH = "EXTRA_REMOTE_PATH"
82-
const val EXTRA_LINKED_TO_PATH = "EXTRA_LINKED_TO_PATH"
83-
const val EXTRA_ACCOUNT_NAME = "EXTRA_ACCOUNT_NAME"
84-
const val EXTRA_CURRENT_DOWNLOAD_ACCOUNT_NAME = "EXTRA_CURRENT_DOWNLOAD_ACCOUNT_NAME"
85-
const val EXTRA_CURRENT_DOWNLOAD_FILE_ID = "EXTRA_CURRENT_DOWNLOAD_FILE_ID"
8680
}
8781

8882
private var currentDownload: DownloadFileOperation? = null
8983

9084
private var conflictUploadId: Long? = null
9185
private var lastPercent = 0
9286

93-
private val fileDownloadBroadcastManager = FileDownloadBroadcastManager(context, localBroadcastManager)
87+
private val fileDownloadEventBroadcaster = FileDownloadEventBroadcaster(context, localBroadcastManager)
9488
private val intents = FileDownloadIntents(context)
9589

9690
private var notificationManager = DownloadNotificationManager(
@@ -205,7 +199,7 @@ class FileDownloadWorker(
205199
requestedDownloads.add(downloadKey)
206200
}
207201

208-
fileDownloadBroadcastManager.sendAdded(
202+
fileDownloadEventBroadcaster.sendDownloadEnqueued(
209203
operation.user.accountName,
210204
operation.remotePath,
211205
context.packageName,
@@ -335,7 +329,7 @@ class FileDownloadWorker(
335329
currentDownload?.run {
336330
notifyDownloadResult(this, downloadResult)
337331

338-
fileDownloadBroadcastManager.sendFinished(
332+
fileDownloadEventBroadcaster.sendDownloadCompleted(
339333
this,
340334
downloadResult,
341335
removeResult.second

app/src/main/java/com/nextcloud/client/jobs/folderDownload/FolderDownloadBroadcastManager.kt renamed to app/src/main/java/com/nextcloud/client/jobs/folderDownload/FolderDownloadEventBroadcaster.kt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,38 @@ package com.nextcloud.client.jobs.folderDownload
1010
import android.content.Context
1111
import android.content.Intent
1212
import androidx.localbroadcastmanager.content.LocalBroadcastManager
13-
import com.nextcloud.client.jobs.download.FileDownloadWorker
13+
import com.nextcloud.client.jobs.download.FileDownloadEventBroadcaster
1414
import com.owncloud.android.lib.common.utils.Log_OC
1515

16-
class FolderDownloadBroadcastManager(
16+
class FolderDownloadEventBroadcaster(
1717
private val context: Context,
1818
private val broadcastManager: LocalBroadcastManager
1919
) {
2020
companion object {
2121
private const val TAG = "📣" + "FolderDownloadBroadcastManager"
2222

23-
const val DOWNLOAD_ADDED = "DOWNLOAD_ADDED"
24-
const val DOWNLOAD_FINISHED = "DOWNLOAD_FINISHED"
23+
private const val ARG_PREFIX = "com.nextcloud.client.folderDownload."
2524

26-
const val EXTRA_FILE_ID = "EXTRA_FILE_ID"
25+
const val ACTION_DOWNLOAD_ENQUEUED = ARG_PREFIX + "ACTION_DOWNLOAD_ENQUEUED"
26+
const val ACTION_DOWNLOAD_COMPLETED = ARG_PREFIX + "ACTION_DOWNLOAD_COMPLETED"
27+
28+
const val EXTRA_FILE_ID = ARG_PREFIX + "EXTRA_FILE_ID"
2729
}
2830

2931
fun sendAdded(id: Long) {
30-
Log_OC.d(TAG, "download added broadcast sent")
32+
Log_OC.d(TAG, "Download enqueued broadcast sent")
3133

32-
val intent = Intent(DOWNLOAD_ADDED).apply {
34+
val intent = Intent(ACTION_DOWNLOAD_ENQUEUED).apply {
3335
putExtra(EXTRA_FILE_ID, id)
3436
}
3537

3638
broadcastManager.sendBroadcast(intent)
3739
}
3840

3941
fun sendFinished(id: Long) {
40-
Log_OC.d(TAG, "download finished broadcast sent")
42+
Log_OC.d(TAG, "Download completed broadcast sent")
4143

42-
val intent = Intent(DOWNLOAD_FINISHED).apply {
44+
val intent = Intent(ACTION_DOWNLOAD_COMPLETED).apply {
4345
putExtra(EXTRA_FILE_ID, id)
4446
}
4547

‎app/src/main/java/com/nextcloud/client/jobs/folderDownload/FolderDownloadWorker.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class FolderDownloadWorker(
4646
}
4747

4848
private val notificationManager = FolderDownloadWorkerNotificationManager(context, viewThemeUtils)
49-
private val folderDownloadBroadcastManager = FolderDownloadBroadcastManager(context, localBroadcastManager)
49+
private val folderDownloadEventBroadcaster = FolderDownloadEventBroadcaster(context, localBroadcastManager)
5050
private lateinit var storageManager: FileDataStorageManager
5151

5252
@Suppress("ReturnCount", "DEPRECATION")
@@ -80,7 +80,7 @@ class FolderDownloadWorker(
8080

8181
trySetForeground(folder)
8282

83-
folderDownloadBroadcastManager.sendAdded(folder.fileId)
83+
folderDownloadEventBroadcaster.sendAdded(folder.fileId)
8484
pendingDownloads.add(folder.fileId)
8585

8686
val downloadHelper = FileDownloadHelper.instance()
@@ -138,7 +138,7 @@ class FolderDownloadWorker(
138138
Log_OC.d(TAG, "❌ failed reason: $e")
139139
Result.failure()
140140
} finally {
141-
folderDownloadBroadcastManager.sendFinished(folder.fileId)
141+
folderDownloadEventBroadcaster.sendFinished(folder.fileId)
142142
pendingDownloads.remove(folder.fileId)
143143
notificationManager.dismiss()
144144
}

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadBroadcastManager.kt renamed to app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadEventBroadcaster.kt

File renamed without changes.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,8 @@ class FileUploadHelper {
520520

521521
class UploadNotificationActionReceiver : BroadcastReceiver() {
522522
override fun onReceive(context: Context, intent: Intent) {
523-
val accountName = intent.getStringExtra(FileUploadWorker.EXTRA_ACCOUNT_NAME)
524-
val remotePath = intent.getStringExtra(FileUploadWorker.EXTRA_REMOTE_PATH)
523+
val accountName = intent.getStringExtra(FileUploadEventBroadcaster.EXTRA_ACCOUNT_NAME)
524+
val remotePath = intent.getStringExtra(FileUploadEventBroadcaster.EXTRA_REMOTE_PATH)
525525
val action = intent.action
526526

527527
if (FileUploadWorker.ACTION_CANCEL_BROADCAST == action) {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import android.util.Pair;
2020

2121
import com.nextcloud.client.account.User;
22-
import com.nextcloud.client.jobs.download.FileDownloadBroadcastManager;
22+
import com.nextcloud.client.jobs.download.FileDownloadEventBroadcaster;
2323
import com.owncloud.android.datamodel.OCFile;
2424
import com.owncloud.android.files.services.IndexedForest;
2525
import com.owncloud.android.lib.common.OwnCloudAccount;
@@ -48,7 +48,7 @@ class SyncFolderHandler extends Handler {
4848

4949
private Account mCurrentAccount;
5050
private SynchronizeFolderOperation mCurrentSyncOperation;
51-
private FileDownloadBroadcastManager fileDownloadBroadcastManager;
51+
private FileDownloadEventBroadcaster fileDownloadEventBroadcaster;
5252

5353

5454
public SyncFolderHandler(Looper looper, OperationsService service) {
@@ -60,7 +60,7 @@ public SyncFolderHandler(Looper looper, OperationsService service) {
6060

6161
final var context = mService.getApplicationContext();
6262
final var broadcastManager = LocalBroadcastManager.getInstance(context);
63-
fileDownloadBroadcastManager = new FileDownloadBroadcastManager(context, broadcastManager);
63+
fileDownloadEventBroadcaster = new FileDownloadEventBroadcaster(context, broadcastManager);
6464
}
6565

6666
/**
@@ -108,10 +108,10 @@ private void doOperation(Account account, String remotePath) {
108108
getClientFor(ocAccount, mService);
109109

110110
result = mCurrentSyncOperation.execute(mOwnCloudClient);
111-
fileDownloadBroadcastManager.sendFinished(account.name, remotePath, mService.getPackageName(), result.isSuccess());
111+
fileDownloadEventBroadcaster.sendDownloadCompleted(account.name, remotePath, mService.getPackageName(), result.isSuccess());
112112
mService.dispatchResultToOperationListeners(mCurrentSyncOperation, result);
113113
} catch (AccountsException | IOException e) {
114-
fileDownloadBroadcastManager.sendFinished(account.name, remotePath, mService.getPackageName(), false);
114+
fileDownloadEventBroadcaster.sendDownloadCompleted(account.name, remotePath, mService.getPackageName(), false);
115115
mService.dispatchResultToOperationListeners(mCurrentSyncOperation, new RemoteOperationResult<>(e));
116116
Log_OC.e(TAG, "Error while trying to get authorization", e);
117117
} finally {
@@ -124,12 +124,12 @@ public void add(Account account, String remotePath,
124124
SynchronizeFolderOperation syncFolderOperation){
125125
Pair<String, String> putResult = mPendingOperations.putIfAbsent(account.name, remotePath, syncFolderOperation);
126126
if (putResult != null) {
127-
fileDownloadBroadcastManager.sendAdded(account.name,
128-
remotePath,
129-
mService.getPackageName(),
130-
syncFolderOperation.getFolderId(),
131-
null,
132-
syncFolderOperation.getAccountName());
127+
fileDownloadEventBroadcaster.sendDownloadEnqueued(account.name,
128+
remotePath,
129+
mService.getPackageName(),
130+
syncFolderOperation.getFolderId(),
131+
null,
132+
syncFolderOperation.getAccountName());
133133
}
134134
}
135135

0 commit comments

Comments
 (0)