Merge pull request #7050 from grote/4998-cancel-notification

Ensure that upload notification gets cancelled

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

@@ -751,6 +751,8 @@ public class FileUploader extends Service
             mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
         }
 
+        mNotificationManager.cancel(FOREGROUND_SERVICE_ID);
+
         // Only notify if the upload fails
         if (!uploadResult.isCancelled() &&
             !uploadResult.isSuccess() &&