rebase with new master

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>

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

@@ -59,6 +59,7 @@ import com.owncloud.android.utils.ErrorMessageAdapter
 import com.owncloud.android.utils.FilesUploadHelper
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import java.io.File
+import java.security.SecureRandom
 
 @Suppress("LongParameterList")
 class FilesUploadWorker(
@@ -398,6 +399,7 @@ class FilesUploadWorker(
     }
 
     private fun cancelOldErrorNotification(uploadFileOperation: UploadFileOperation){
+        //cancel for old file because of file conflicts
         notificationManager.cancel(NotificationUtils.createUploadNotificationTag(uploadFileOperation.oldFile),
             NOTIFICATION_ERROR_ID)
         notificationManager.cancel(NotificationUtils.createUploadNotificationTag(uploadFileOperation.file),

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

@@ -1448,6 +1448,7 @@ public class FileUploader extends Service
         }
 
         if (uploadFileOperation == null) return;
+        //cancel for old file because of file conflicts
         mNotificationManager.cancel(NotificationUtils.createUploadNotificationTag(uploadFileOperation.getOldFile()),
                                    NOTIFICATION_ERROR_ID);
         mNotificationManager.cancel(NotificationUtils.createUploadNotificationTag(uploadFileOperation.getFile()),