Skip to content

Commit c68ac1f

Browse files
committed
fix(upload-list): handle conflict actions
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 702f2f0 commit c68ac1f

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import com.nextcloud.client.network.ConnectivityService
2525
import com.nextcloud.client.notifications.AppWideNotificationManager
2626
import com.nextcloud.utils.extensions.checkWCFRestrictions
2727
import com.nextcloud.utils.extensions.getUploadIds
28+
import com.nextcloud.utils.extensions.isAnonymous
2829
import com.nextcloud.utils.extensions.isLastResultConflictError
2930
import com.nextcloud.utils.extensions.isSame
3031
import com.owncloud.android.MainApp
@@ -184,14 +185,22 @@ class FileUploadHelper {
184185
val batteryStatus = powerManagementService.battery
185186

186187
val uploadsToRetry = mutableListOf<Long>()
187-
val ownCloudClient =
188-
OwnCloudClientFactory.createOwnCloudClient(accountManager.currentAccount, MainApp.getAppContext())
188+
189+
val currentAccount = accountManager.currentAccount
190+
val context = MainApp.getAppContext()
191+
var ownCloudClient: OwnCloudClient? = null
192+
if (!currentAccount.isAnonymous(context)) {
193+
ownCloudClient =
194+
OwnCloudClientFactory.createOwnCloudClient(accountManager.currentAccount, MainApp.getAppContext())
195+
}
189196
val uploadActionHandler = UploadListAdapterActionHandler()
190197

191198
for (upload in uploads) {
192199
if (upload.isLastResultConflictError()) {
193-
conflictHandlingResult =
194-
uploadActionHandler.handleConflict(upload, ownCloudClient, uploadsStorageManager)
200+
ownCloudClient?.let {
201+
conflictHandlingResult =
202+
uploadActionHandler.handleConflict(upload, ownCloudClient, uploadsStorageManager)
203+
}
195204
continue
196205
}
197206

0 commit comments

Comments
 (0)