Merge pull request #82 from MobileApplicationsClub/cancel-uploads

added cancel action in upload notification

Author: Rushi98

androidClient/app/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0-rc02'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.0.0-rc01'
+    implementation 'com.google.android.material:material:1.0.0-rc02'
     implementation 'pub.devrel:easypermissions:1.2.0'
     implementation('com.google.api-client:google-api-client-android:1.23.0') {
         exclude group: 'org.apache.httpcomponents'
@@ -48,9 +48,9 @@ dependencies {
         exclude group: 'org.apache.httpcomponents'
     }
     implementation 'com.google.firebase:firebase-core:16.0.3'
-    implementation 'com.google.firebase:firebase-database:16.0.1'
+    implementation 'com.google.firebase:firebase-database:16.0.2'
     implementation 'com.google.firebase:firebase-auth:16.0.3'
-    implementation 'com.google.firebase:firebase-messaging:17.3.0'
+    implementation 'com.google.firebase:firebase-messaging:17.3.1'
     implementation 'com.google.firebase:firebase-config:16.0.0'
     implementation 'com.google.android.gms:play-services-auth:16.0.0'
     implementation 'com.facebook.fresco:fresco:1.10.0'
@@ -60,12 +60,12 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
     def room_version = "2.0.0-rc01"
     implementation "androidx.room:room-runtime:$room_version"
-    implementation 'com.android.support:design:28.0.0-rc01'
+    implementation 'com.android.support:design:28.0.0-rc02'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
     implementation "com.android.support:support-core-utils:28.1.1"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
-    implementation 'com.android.support:support-v4:28.0.0-rc01'
-    implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support:support-v4:28.0.0-rc02'
+    implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
     kapt "androidx.room:room-compiler:$room_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.code.gson:gson:2.8.5'

androidClient/app/src/main/java/com/macbitsgoa/comrades/coursematerial/UploadUtil.java

@@ -1,9 +1,7 @@
 package com.macbitsgoa.comrades.coursematerial;
 
 import android.app.Notification;
-import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 
@@ -35,32 +33,19 @@ public class UploadUtil {
     public static final String DRIVE_API_BASE_URL = "https://www.googleapis.com/drive/v3/files/";
     public static final String AUTHORIZATION_FIELD_KEY = "Authorization";
     public static final String AUTHORIZATION_FIELD_VALUE_PREFIX = "Bearer ";
-    private static final String KEY_ACCESS_TOKEN = "accessToken";
-    private static final String KEY_FILE_PATH = "filepath";
-    private static final String KEY_FILE_NAME = "filename";
     private static final String TAG = TAG_PREFIX + UploadUtil.class.getSimpleName();
 
-    public static Intent makeUploadIntent(final Context context, final String path, final String accessToken,
-                                          final String fileName) {
-        Intent intent = new Intent(context, UploadUtil.class);
-        intent.putExtra(KEY_FILE_NAME, fileName);
-        intent.putExtra(KEY_ACCESS_TOKEN, accessToken);
-        intent.putExtra(KEY_FILE_PATH, path);
-        return intent;
-    }
-
-    public static NotificationCompat.Builder sendNotification(Context context, int drawable, CharSequence message, CharSequence messageDetails) {
-        PendingIntent contentIntent = PendingIntent.getActivity(context, 0,
-                new Intent(context, UploadUtil.class), 0);
-
+    public static NotificationCompat.Builder sendNotification(Context context, int drawable, CharSequence message, CharSequence messageDetails, NotificationCompat.Action action) {
         NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context, "progress")
                 .setSmallIcon(drawable)
                 .setContentTitle(message)
                 .setContentText(messageDetails)
                 .setColor(R.color.colorAccent)
                 .setAutoCancel(false)
                 .setPriority(Notification.PRIORITY_HIGH);
-        mBuilder.setContentIntent(contentIntent);
+        if (action != null) {
+            mBuilder.addAction(action);
+        }
         return mBuilder;
     }
 

androidClient/app/src/main/java/com/macbitsgoa/comrades/coursematerial/Uploader.java

@@ -1,7 +1,11 @@
 package com.macbitsgoa.comrades.coursematerial;
 
 import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.media.RingtoneManager;
 import android.util.Log;
 
@@ -10,6 +14,7 @@
 import com.google.firebase.database.DatabaseReference;
 import com.macbitsgoa.comrades.R;
 import com.macbitsgoa.comrades.persistance.Database;
+import com.squareup.okhttp.Call;
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
@@ -23,6 +28,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.security.SecureRandom;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import androidx.annotation.NonNull;
@@ -58,6 +64,9 @@ public class Uploader extends Worker {
     public static final String KEY_FILE_NAME = "fileName";
     public static final String KEY_COURSE_ID = "courseId";
     private static final String TAG = TAG_PREFIX + Uploader.class.getSimpleName();
+    private static final String ACTION_CANCEL_UPLOAD = Uploader.class.getName() + ".action.cancel.upload";
+    private static final String KEY_FILE_HASH = Uploader.class.getName() + ".key.fileHash";
+    private static IntentFilter cancelUploadFilter = new IntentFilter(ACTION_CANCEL_UPLOAD);
     private String path;
     private String accessToken;
     private String fileName;
@@ -68,6 +77,8 @@ public class Uploader extends Worker {
     private NotificationManager notificationManager;
     private NotificationCompat.Builder builder;
     private int notificationId;
+    private Call uploadCall;
+    private boolean cancelledByUser = false;
 
     /**
      * Handy method to access this class.
@@ -108,7 +119,6 @@ public Result doWork() {
         notificationManager = (NotificationManager)
                 getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
 
-        notifyInit();
         fileHash = calculateMD5(new File(path));
         CourseMaterial duplicate = findDuplicate();
         if (duplicate != null) {
@@ -118,6 +128,10 @@ public Result doWork() {
 
         String response = uploadFile();
         if (response == null) {
+            if (cancelledByUser) {
+                notificationManager.cancel(notificationId);
+                return Result.SUCCESS;
+            }
             notifyFailure();
             return Result.FAILURE;
         }
@@ -208,7 +222,9 @@ private String uploadFile() {
                     )
                     .post(requestBody)
                     .build();
-            final Response response = okHttpClient.newCall(request).execute();
+            uploadCall = okHttpClient.newCall(request);
+            notifyInit();
+            final Response response = uploadCall.execute();
             if (response == null) {
                 Log.e(TAG, "null response");
                 return null;
@@ -307,31 +323,45 @@ private CourseMaterial findDuplicate() {
 
     private void notifyDuplicate(String originalFileName) {
         builder = sendNotification(getApplicationContext(), R.drawable.ic_cloud_done_black_24dp, fileName + " couldn't be uploaded",
-                "A similar file already exists in this course with name " + originalFileName);
+                "A similar file already exists in this course with name " + originalFileName, null);
         builder.setProgress(0, 0, false);
         builder.setOngoing(false);
         builder.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION));
         notificationManager.notify(notificationId, builder.build());
     }
 
     private void notifyInit() {
-        builder = sendNotification(getApplicationContext(), R.drawable.ic_launcher_foreground, "Uploading " + fileName, "Please wait...");
+        final int cancelUploadRc = notificationId;
+        Intent broadcast = new Intent(ACTION_CANCEL_UPLOAD);
+        broadcast.putExtra(KEY_FILE_HASH, fileHash);
+        PendingIntent cancelIntent = PendingIntent.getBroadcast(getApplicationContext(), cancelUploadRc, broadcast, PendingIntent.FLAG_ONE_SHOT);
+        final NotificationCompat.Action cancelAction = new NotificationCompat.Action(R.drawable.ic_close_black_24dp, getApplicationContext().getString(R.string.cancel), cancelIntent);
+        getApplicationContext().registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(final Context context, final Intent intent) {
+                if (Objects.equals(fileHash, intent.getStringExtra(KEY_FILE_HASH))) {
+                    cancelledByUser = true;
+                    uploadCall.cancel();
+                }
+            }
+        }, cancelUploadFilter);
+        builder = sendNotification(getApplicationContext(), R.drawable.ic_launcher_foreground, "Uploading " + fileName, "Please wait...", cancelAction);
         builder.setProgress(0, 0, true);
         builder.setOngoing(true);
         notificationManager.notify(notificationId, builder.build());
     }
 
     private void notifyFailure() {
         builder = sendNotification(getApplicationContext(), R.drawable.ic_launcher_foreground, "Comrades",
-                "File Could not be uploaded.Please try again later.");
+                "File Could not be uploaded. Please try again later.", null);
         builder.setProgress(0, 0, false);
         builder.setOngoing(false);
         notificationManager.notify(notificationId, builder.build());
     }
 
     private void notifySuccess() {
         builder = sendNotification(getApplicationContext(), R.drawable.ic_cloud_done_black_24dp, fileName + " uploaded",
-                "Thanks for Contributing");
+                "Thanks for Contributing", null);
         builder.setProgress(0, 0, false);
         builder.setOngoing(false);
         builder.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION));

androidClient/app/src/main/res/drawable/ic_close_black_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>