add unsubscribe action for requests

ragnraok · Nov 15, 2015 · 24ac464 · 24ac464
1 parent 498c2b0
commit 24ac464
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/lib/src/main/java/com/ragnarok/rxcamera/request/PeriodicDataRequest.java b/lib/src/main/java/com/ragnarok/rxcamera/request/PeriodicDataRequest.java
@@ -41,18 +41,6 @@ public Observable<RxCameraData> get() {
             @Override
             public void call(final Subscriber<? super RxCameraData> subscriber) {
                 PeriodicDataRequest.this.subscriber = subscriber;
-                subscriber.add(new Subscription() {
-                    @Override
-                    public void unsubscribe() {
-                        rxCamera.uninstallPreviewCallback(PeriodicDataRequest.this);
-                        isInstallCallback = false;
-                    }
-
-                    @Override
-                    public boolean isUnsubscribed() {
-                        return false;
-                    }
-                });
                 subscriber.add(Schedulers.newThread().createWorker().schedulePeriodically(new Action0() {
                     @Override
                     public void call() {
@@ -63,6 +51,12 @@ public void call() {
                 }, 0, intervalMills, TimeUnit.MILLISECONDS));
 
             }
+        }).doOnUnsubscribe(new Action0() {
+            @Override
+            public void call() {
+                rxCamera.uninstallPreviewCallback(PeriodicDataRequest.this);
+                isInstallCallback = false;
+            }
         });
     }
 

diff --git a/lib/src/main/java/com/ragnarok/rxcamera/request/SuccessiveDataRequest.java b/lib/src/main/java/com/ragnarok/rxcamera/request/SuccessiveDataRequest.java
@@ -9,6 +9,7 @@
 import rx.Observable;
 import rx.Subscriber;
 import rx.Subscription;
+import rx.functions.Action0;
 
 
 /**
@@ -35,19 +36,12 @@ public Observable<RxCameraData> get() {
             @Override
             public void call(final Subscriber<? super RxCameraData> subscriber) {
                 successiveDataSubscriber = subscriber;
-                successiveDataSubscriber.add(new Subscription() {
-                    @Override
-                    public void unsubscribe() {
-                        Log.d(TAG, "unsubscribe successiveDataSubscriber");
-                        rxCamera.uninstallPreviewCallback(SuccessiveDataRequest.this);
-                        isInstallSuccessivePreviewCallback = false;
-                    }
-
-                    @Override
-                    public boolean isUnsubscribed() {
-                        return false;
-                    }
-                });
+            }
+        }).doOnUnsubscribe(new Action0() {
+            @Override
+            public void call() {
+                rxCamera.uninstallPreviewCallback(SuccessiveDataRequest.this);
+                isInstallSuccessivePreviewCallback = false;
             }
         });
     }