From 08ccf4c2798b21deeb9395966ecadf72508d1458 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Mon, 21 Apr 2014 13:05:50 +0200
Subject: Stop all images tab downloads in onDestroy()

---
 main/src/cgeo/geocaching/CacheDetailActivity.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main/src/cgeo/geocaching/CacheDetailActivity.java')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 6214a1a..b8f4703 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -60,10 +60,10 @@ import rx.Observable.OnSubscribe;
 import rx.Observer;
 import rx.Scheduler.Inner;
 import rx.Subscriber;
-import rx.Subscription;
 import rx.android.observables.AndroidObservable;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
 
 import android.R.color;
 import android.app.AlertDialog;
@@ -168,7 +168,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     private TextView cacheDistanceView;
 
     protected ImagesList imagesList;
-    private Subscription imagesSubscription;
+    private CompositeSubscription createSubscriptions;
     /**
      * waypoint selected in context menu. This variable will be gone when the waypoint context menu is a fragment.
      */
@@ -178,6 +178,8 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.cachedetail_activity);
 
+        createSubscriptions = new CompositeSubscription();
+
         // set title in code, as the activity needs a hard coded title due to the intent filters
         setTitle(res.getString(R.string.cache));
 
@@ -330,9 +332,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
     @Override
     public void onDestroy() {
-        if (imagesList != null) {
-            imagesSubscription.unsubscribe();
-        }
+        createSubscriptions.unsubscribe();
         super.onDestroy();
     }
 
@@ -649,7 +649,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             return;
         }
         imagesList = new ImagesList(this, cache.getGeocode());
-        imagesSubscription = imagesList.loadImages(imageView, cache.getImages(), false);
+        createSubscriptions.add(imagesList.loadImages(imageView, cache.getImages(), false));
     }
 
     public static void startActivity(final Context context, final String geocode) {
-- 
cgit v1.1