refactoring: makes unsubscribing from image loading easier

This is related to #3618.

1 files changed, 5 insertions, 3 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 52214f4..b905a46 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -61,9 +61,10 @@ import rx.Observable;
 import rx.Observable.OnSubscribe;
 import rx.Observer;
 import rx.Subscriber;
+import rx.Subscription;
 import rx.android.observables.AndroidObservable;
-import rx.schedulers.Schedulers;
 import rx.functions.Action1;
+import rx.schedulers.Schedulers;
 
 import android.R.color;
 import android.app.AlertDialog;
@@ -168,6 +169,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     private TextView cacheDistanceView;
 
     protected ImagesList imagesList;
+    private Subscription imagesSubscription;
     /**
      * waypoint selected in context menu. This variable will be gone when the waypoint context menu is a fragment.
      */
@@ -324,7 +326,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     @Override
     public void onDestroy() {
         if (imagesList != null) {
-            imagesList.removeAllViews();
+            imagesSubscription.unsubscribe();
         }
         super.onDestroy();
     }
@@ -702,7 +704,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             return;
         }
         imagesList = new ImagesList(this, cache.getGeocode());
-        imagesList.loadImages(imageView, cache.getImages(), false);
+        imagesSubscription = imagesList.loadImages(imageView, cache.getImages(), false);
     }
 
     public static void startActivity(final Context context, final String geocode) {