1 files changed, 43 insertions, 49 deletions

diff --git a/main/src/cgeo/geocaching/ui/ImagesList.java b/main/src/cgeo/geocaching/ui/ImagesList.java
index 4eaf06d..f564583 100644
--- a/main/src/cgeo/geocaching/ui/ImagesList.java
+++ b/main/src/cgeo/geocaching/ui/ImagesList.java
@@ -9,6 +9,9 @@ import cgeo.geocaching.utils.Log;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import rx.android.concurrency.AndroidSchedulers;
+import rx.subscriptions.CompositeSubscription;
+import rx.util.functions.Action1;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -18,7 +21,6 @@ import android.graphics.Bitmap.CompressFormat;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.text.Html;
 import android.util.SparseArray;
 import android.view.ContextMenu;
@@ -41,11 +43,11 @@ public class ImagesList {
 
     private BitmapDrawable currentDrawable;
     private Image currentImage;
+    private CompositeSubscription subscriptions = new CompositeSubscription();
 
     public enum ImageType {
         LogImages(R.string.cache_log_images_title),
-        SpoilerImages(R.string.cache_spoiler_images_title),
-        AllImages(R.string.cache_images_title);
+        SpoilerImages(R.string.cache_spoiler_images_title);
 
         private final int titleResId;
 
@@ -76,11 +78,13 @@ public class ImagesList {
     }
 
     public void loadImages(final View parentView, final List<Image> images, final boolean offline) {
-
         imagesView = (LinearLayout) parentView.findViewById(R.id.spoiler_list);
 
+        final HtmlImage imgGetter = new HtmlImage(geocode, true, offline ? StoredList.STANDARD_LIST_ID : StoredList.TEMPORARY_LIST_ID, false);
+
         for (final Image img : images) {
-            LinearLayout rowView = (LinearLayout) inflater.inflate(R.layout.cache_image_item, null);
+            final LinearLayout rowView = (LinearLayout) inflater.inflate(R.layout.cache_image_item, null);
+            assert(rowView != null);
 
             if (StringUtils.isNotBlank(img.getTitle())) {
                 ((TextView) rowView.findViewById(R.id.title)).setText(Html.fromHtml(img.getTitle()));
@@ -93,66 +97,56 @@ public class ImagesList {
                 descView.setVisibility(View.VISIBLE);
             }
 
-            new AsyncImgLoader(rowView, img, offline).execute();
+            subscriptions.add(imgGetter.fetchDrawable(img.getUrl())
+                    .observeOn(AndroidSchedulers.mainThread()).subscribe(new Action1<BitmapDrawable>() {
+                        @Override
+                        public void call(final BitmapDrawable image) {
+                            display(image, img, rowView);
+                        }
+                    }));
+
             imagesView.addView(rowView);
         }
     }
 
-    private class AsyncImgLoader extends AsyncTask<Void, Void, BitmapDrawable> {
+    private void display(final BitmapDrawable image, final Image img, final LinearLayout view) {
+        if (image != null) {
+            bitmaps.add(image.getBitmap());
+            final ImageView imageView = (ImageView) inflater.inflate(R.layout.image_item, null);
+            assert(imageView != null);
 
-        final private LinearLayout view;
-        final private Image img;
-        final boolean offline;
+            final Rect bounds = image.getBounds();
 
-        public AsyncImgLoader(final LinearLayout view, final Image img, final boolean offline) {
-            this.view = view;
-            this.img = img;
-            this.offline = offline;
-        }
+            imageView.setImageResource(R.drawable.image_not_loaded);
+            imageView.setClickable(true);
+            imageView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View arg0) {
+                    viewImageInStandardApp(image);
+                }
+            });
+            activity.registerForContextMenu(imageView);
+            imageView.setImageDrawable(image);
+            imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            imageView.setLayoutParams(new LayoutParams(bounds.width(), bounds.height()));
 
-        @Override
-        protected BitmapDrawable doInBackground(Void... params) {
-            final HtmlImage imgGetter = new HtmlImage(geocode, true, offline ? StoredList.STANDARD_LIST_ID : StoredList.TEMPORARY_LIST_ID, false);
-            return imgGetter.getDrawable(img.getUrl());
-        }
+            view.findViewById(R.id.progress_bar).setVisibility(View.GONE);
+            view.addView(imageView);
 
-        @Override
-        protected void onPostExecute(final BitmapDrawable image) {
-            if (image != null) {
-                bitmaps.add(image.getBitmap());
-                final ImageView imageView = (ImageView) inflater.inflate(R.layout.image_item, null);
-
-                final Rect bounds = image.getBounds();
-
-                imageView.setImageResource(R.drawable.image_not_loaded);
-                imageView.setClickable(true);
-                imageView.setOnClickListener(new View.OnClickListener() {
-
-                    @Override
-                    public void onClick(View arg0) {
-                        viewImageInStandardApp(image);
-                    }
-                });
-                activity.registerForContextMenu(imageView);
-                imageView.setImageDrawable(image);
-                imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-                imageView.setLayoutParams(new LayoutParams(bounds.width(), bounds.height()));
-
-                view.findViewById(R.id.progress_bar).setVisibility(View.GONE);
-                view.addView(imageView);
-
-                imageView.setId(image.hashCode());
-                images.put(imageView.getId(), img);
-            }
+            imageView.setId(image.hashCode());
+            images.put(imageView.getId(), img);
         }
     }
 
     public void removeAllViews() {
-        imagesView.removeAllViews();
         for (final Bitmap b : bitmaps) {
             b.recycle();
         }
         bitmaps.clear();
+
+        // Stop loading images if some are still in progress
+        subscriptions.unsubscribe();
+        imagesView.removeAllViews();
     }
 
     public void onCreateContextMenu(ContextMenu menu, View v) {