Use NotificationManagerCompat; add notification tag; assign temporaty stash file name

Author: whym

app/src/main/java/fr/free/nrw/commons/upload/UploadService.java

@@ -10,6 +10,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
 import android.widget.Toast;
 
 import java.io.File;
@@ -55,7 +56,7 @@ public class UploadService extends HandlerService<Contribution> {
     @Inject SessionManager sessionManager;
     @Inject ContributionDao contributionDao;
 
-    private NotificationManager notificationManager;
+    private NotificationManagerCompat notificationManager;
     private NotificationCompat.Builder curProgressNotification;
     private NotificationCompat.Builder curFailedNotification;
     private int toUpload;
@@ -108,7 +109,7 @@ public void onProgress(long transferred, long total) {
             } else {
                 curProgressNotification.setProgress(100, (int) (((double) transferred / (double) total) * 100), false);
             }
-            notificationManager.notify(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build());
+            notificationManager.notify(notificationTag, NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build());
 
             contribution.setTransferred(transferred);
             contributionDao.save(contribution);
@@ -126,7 +127,7 @@ public void onDestroy() {
     public void onCreate() {
         super.onCreate();
         CommonsApplication.createNotificationChannel(getApplicationContext());
-        notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        notificationManager = NotificationManagerCompat.from(this);
         curProgressNotification = getProgressNotificationBuilder(CommonsApplication.NOTIFICATION_CHANNEL_ID_ALL);
         curFailedNotification = getFailedNotificationBuilder(CommonsApplication.NOTIFICATION_CHANNEL_ID_ALL);
     }
@@ -155,7 +156,7 @@ public void queue(int what, Contribution contribution) {
                 if (curProgressNotification != null && toUpload != 1) {
                     curProgressNotification.setContentText(getResources().getQuantityString(R.plurals.uploads_pending_notification_indicator, toUpload, toUpload));
                     Timber.d("%d uploads left", toUpload);
-                    notificationManager.notify(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build());
+                    notificationManager.notify(contribution.getLocalUri().toString(), NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build());
                 }
 
                 super.queue(what, contribution);
@@ -229,9 +230,10 @@ private void uploadContribution(Contribution contribution) {
         curProgressNotification.setContentTitle(getString(R.string.upload_progress_notification_title_start, contribution.getDisplayTitle()))
                 .setContentText(getResources().getQuantityString(R.plurals.uploads_pending_notification_indicator, toUpload, toUpload))
                 .setTicker(getString(R.string.upload_progress_notification_title_in_progress, contribution.getDisplayTitle()));
-        startForeground(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build());
+        notificationManager.notify(notificationTag, NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build());
 
         String filename = contribution.getFilename();
+
         try {
 
             if (!mwApi.validateLogin()) {
@@ -252,17 +254,16 @@ private void uploadContribution(Contribution contribution) {
                     getString(R.string.upload_progress_notification_title_finishing, contribution.getDisplayTitle()),
                     contribution
             );
+            String stashFilename = filename + contribution.hashCode();
             mwApi.uploadFile(
-                    filename, fileInputStream, contribution.getDataLength(),
+                    stashFilename, fileInputStream, contribution.getDataLength(),
                     localUri, contribution.getContentProviderUri(), notificationUpdater)
                     .subscribeOn(Schedulers.io())
                     .observeOn(Schedulers.io())
                     .flatMap(uploadStash -> {
                         notificationManager.cancel(NOTIFICATION_UPLOAD_IN_PROGRESS);
 
-                        Timber.d("Response 1 is %s", uploadStash.toString());
-
-                        curProgressNotification = null;
+                        Timber.d("Stash upload response 1 is %s", uploadStash.toString());
 
                         String resultStatus = uploadStash.getResultStatus();
                         if (!resultStatus.equals("Success")) {
@@ -283,7 +284,10 @@ private void uploadContribution(Contribution contribution) {
                         }
                     })
                     .subscribe(uploadResult -> {
-                        Timber.d("Response 2 is %s", uploadResult.toString());
+                        Timber.d("Stash upload response 2 is %s", uploadResult.toString());
+
+                        notificationManager.cancel(notificationTag, NOTIFICATION_UPLOAD_IN_PROGRESS);
+                        curProgressNotification = null;
 
                         String resultStatus = uploadResult.getResultStatus();
                         if (!resultStatus.equals("Success")) {
@@ -326,7 +330,7 @@ private void showFailedNotification(Contribution contribution) {
         curFailedNotification.setTicker(getString(R.string.upload_failed_notification_title, contribution.getDisplayTitle()))
                 .setContentTitle(getString(R.string.upload_failed_notification_title, contribution.getDisplayTitle()))
                 .setContentText(getString(R.string.upload_failed_notification_subtitle));
-        notificationManager.notify(NOTIFICATION_UPLOAD_FAILED, curFailedNotification.build());
+        notificationManager.notify(contribution.getLocalUri().toString(), NOTIFICATION_UPLOAD_FAILED, curFailedNotification.build());
 
         contribution.setState(Contribution.STATE_FAILED);
         contributionDao.save(contribution);