mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

hopefully really fix dodgy code

Browse source 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
This commit is contained in:
Jonas Mayer 2023-12-07 00:21:15 +01:00 committed by tobiasKaminsky
parent 322565f099
commit 5326d08aeb
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/owncloud/android/files/services/FileUploader.java
View file

@ -1447,12 +1447,19 @@ public class FileUploader extends Service
mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
}
if (uploadFileOperation == null || uploadFileOperation.getOldFile() == null) return;
//cancel for old file because of file conflicts
mNotificationManager.cancel(NotificationUtils.createUploadNotificationTag(uploadFileOperation.getOldFile()),
NOTIFICATION_ERROR_ID);
if (uploadFileOperation == null) return;
mNotificationManager.cancel(NotificationUtils.createUploadNotificationTag(uploadFileOperation.getFile()),
NOTIFICATION_ERROR_ID);
NOTIFICATION_ERROR_ID);
//cancel for old file because of file conflicts
OCFile oldFile = uploadFileOperation.getOldFile();
if ( oldFile != null) {
mNotificationManager.cancel(NotificationUtils.createUploadNotificationTag(oldFile),
NOTIFICATION_ERROR_ID);
}
}