Using a ScheduledAction in order to ensure correct subscription behaviour.

Signed-off-by: David Marques <[email protected]>

Author: dpsm

rxjava-contrib/rxjava-android/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java

@@ -21,6 +21,7 @@
 import rx.Subscription;
 import rx.functions.Action0;
 import rx.functions.Action1;
+import rx.internal.schedulers.ScheduledAction;
 import rx.subscriptions.BooleanSubscription;
 import rx.subscriptions.CompositeSubscription;
 import rx.subscriptions.Subscriptions;
@@ -70,27 +71,18 @@ public boolean isUnsubscribed() {
 
         @Override
         public Subscription schedule(final Action0 action, long delayTime, TimeUnit unit) {
-            final Runnable runnable = new Runnable() {
-                @Override
-                public void run() {
-                    if (isUnsubscribed()) {
-                        return;
-                    }
-                    action.call();
-                }
-            };
-            handler.postDelayed(runnable, unit.toMillis(delayTime));
-
-            final Subscription subscription = Subscriptions.create(new Action0() {
+            final ScheduledAction scheduledAction = new ScheduledAction(action);
+            scheduledAction.addParent(mCompositeSubscription);
+            scheduledAction.add(Subscriptions.create(new Action0() {
                 @Override
                 public void call() {
-                    handler.removeCallbacks(runnable);
-
+                    handler.removeCallbacks(scheduledAction);
                 }
-            });
-            mCompositeSubscription.add(subscription);
+            }));
+
+            handler.postDelayed(scheduledAction, unit.toMillis(delayTime));
 
-            return Subscriptions.empty();
+            return scheduledAction;
         }
 
         @Override