Added canceling of downloads

Clover/app/src/main/java/org/floens/chan/utils/ImageSaver.java

@@ -19,9 +19,11 @@ package org.floens.chan.utils;
 
 import android.app.AlertDialog;
 import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.Environment;
@@ -40,25 +42,57 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class ImageSaver {
     private static final String TAG = "ImageSaver";
+    private static BroadcastReceiver receiver;
 
     public static void saveAll(final Context context, String folderName, final List<DownloadPair> list) {
-        final DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-
         folderName = filterName(folderName);
 
         final File subFolder = findUnused(new File(ChanPreferences.getImageSaveDirectory() + File.separator + folderName), true);
 
-        String text = context.getString(R.string.download_confirm)
+        String text = context.getString(R.string.download_confirm, Integer.toString(list.size()), subFolder.getAbsolutePath());
-                .replace("COUNT", Integer.toString(list.size()))
-                .replace("FOLDER", subFolder.getAbsolutePath());
 
         new AlertDialog.Builder(context).setMessage(text).setNegativeButton(R.string.cancel, null)
                 .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
+                        listDownload(context, subFolder, list);
+                    }
+                }).show();
+    }
+
+    public static void saveImage(final Context context, String imageUrl, String name, final String extension, final boolean share) {
+        File saveDir = ChanPreferences.getImageSaveDirectory();
+
+        if (!saveDir.isDirectory() && !saveDir.mkdirs()) {
+            Toast.makeText(context, R.string.image_save_directory_error, Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        String fileName = filterName(name + "." + extension);
+        final File file = findUnused(new File(saveDir, fileName), false);
+
+        Logger.test(file.getAbsolutePath());
+
+        ChanApplication.getVolleyRequestQueue().add(new ByteArrayRequest(imageUrl, new Response.Listener<byte[]>() {
+            @Override
+            public void onResponse(byte[] data) {
+                storeImage(context, data, file, share);
+            }
+        }, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+                Toast.makeText(context, R.string.image_open_failed, Toast.LENGTH_LONG).show();
+            }
+        }));
+    }
+
+    private static void listDownload(Context context, File subFolder, final List<DownloadPair> list) {
+        final DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+
         if (!subFolder.isDirectory() && !subFolder.mkdirs()) {
             Toast.makeText(context, R.string.image_save_directory_error, Toast.LENGTH_LONG).show();
             return;
@@ -77,10 +111,17 @@ public class ImageSaver {
             files.add(p);
         }
 
+        final AtomicBoolean stopped = new AtomicBoolean(false);
+        final List<Long> ids = new ArrayList<>();
+
         new Thread(new Runnable() {
             @Override
             public void run() {
                 for (Pair pair : files) {
+                    if (stopped.get()) {
+                        break;
+                    }
+
                     DownloadManager.Request request;
                     try {
                         request = new DownloadManager.Request(pair.uri);
@@ -92,38 +133,41 @@ public class ImageSaver {
                     request.setVisibleInDownloadsUi(false);
                     request.allowScanningByMediaScanner();
 
-                                    dm.enqueue(request);
+                    synchronized (stopped) {
+                        if (stopped.get()) {
+                            break;
                         }
+                        ids.add(dm.enqueue(request));
                     }
-                        }).start();
                 }
-                }).show();
             }
+        }).start();
 
-    public static void saveImage(final Context context, String imageUrl, String name, final String extension, final boolean share) {
+        receiver = new BroadcastReceiver() {
-        File saveDir = ChanPreferences.getImageSaveDirectory();
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (DownloadManager.ACTION_NOTIFICATION_CLICKED.equals(intent.getAction())) {
+                    synchronized (stopped) {
+                        stopped.set(true);
 
-        if (!saveDir.isDirectory() && !saveDir.mkdirs()) {
+                        for (Long id : ids) {
-            Toast.makeText(context, R.string.image_save_directory_error, Toast.LENGTH_LONG).show();
+                            dm.remove(id);
-            return;
                         }
-
-        String fileName = filterName(name + "." + extension);
-        final File file = findUnused(new File(saveDir, fileName), false);
-
-        Logger.test(file.getAbsolutePath());
-
-        ChanApplication.getVolleyRequestQueue().add(new ByteArrayRequest(imageUrl, new Response.Listener<byte[]>() {
-            @Override
-            public void onResponse(byte[] data) {
-                storeImage(context, data, file, share);
                     }
-        }, new Response.ErrorListener() {
+                } else if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) {
-            @Override
+                    if (receiver != null) {
-            public void onErrorResponse(VolleyError error) {
+                        context.unregisterReceiver(receiver);
-                Toast.makeText(context, R.string.image_open_failed, Toast.LENGTH_LONG).show();
+                        receiver = null;
                     }
-        }));
+                }
+            }
+        };
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(DownloadManager.ACTION_NOTIFICATION_CLICKED);
+        filter.addAction(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
+
+        context.registerReceiver(receiver, filter);
     }
 
     private static String filterName(String name) {

Clover/app/src/main/res/values/strings.xml

@@ -219,7 +219,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <string name="pass_summary_disabled">Off</string>
     <string name="pass_using">Using 4chan pass</string>
 
-    <string name="download_confirm">COUNT images will be downloaded to FOLDER</string>
+    <string name="download_confirm">%1$s images will be downloaded to %2$s</string>
 
     <string name="board_select_add">Add more&#8230;</string>