[#304] Reuse 'data exported' notification

akvo · Jul 6, 2015 · c738b81 · c738b81
1 parent 427f0c2
commit c738b81
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/src/main/java/org/akvo/flow/service/DataSyncService.java b/app/src/main/java/org/akvo/flow/service/DataSyncService.java
@@ -116,6 +116,9 @@ public class DataSyncService extends IntentService {
     private static final String ACTION_SUBMIT = "submit";
     private static final String ACTION_IMAGE = "image";
 
+    // Reuse notification for data export
+    private static final int NOTIFICATION_DATA_EXPORT = 1;
+
     /**
      * Number of retries to upload a file to S3
      */
@@ -164,7 +167,8 @@ private void exportSurveys() {
         for (long id : getUnexportedSurveys()) {
             ZipFileData zipFileData = formZip(id);
             if (zipFileData != null) {
-                displayNotification(id, getString(R.string.exportcomplete), getDestName(zipFileData.filename));
+                displayNotification(NOTIFICATION_DATA_EXPORT, getString(R.string.exportcomplete),
+                        getDestName(zipFileData.filename));
 
                 // Create new entries in the transmission queue
                 mDatabase.createTransmission(id, zipFileData.formId, zipFileData.filename);
@@ -466,7 +470,7 @@ private boolean syncFile(String filename, String formId, int status, String serv
                     break;
                 case HttpStatus.SC_NOT_FOUND:
                     // This form has been deleted in the dashboard, thus we cannot sync it
-                    displayNotification(Integer.valueOf(formId),
+                    displayNotification(formId(formId),
                             "Form " + formId + " does not exist", "It has probably been deleted");
                     mDatabase.updateTransmissionHistory(filename, TransmissionStatus.FORM_DELETED);
                     ok = false;// Consider this a failed transmission