Merge pull request #821 from benjchristensen/fix-android-merge

Update to use Subscriber/Subscriptions.create

Author: benjchristensen

rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorCompoundButtonInput.java

@@ -15,17 +15,19 @@
  */
 package rx.operators;
 
-import android.view.View;
-import android.widget.CompoundButton;
-import rx.Observable;
-import rx.Observer;
-import rx.Subscription;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
 
+import rx.Observable;
+import rx.Subscriber;
+import rx.Subscription;
+import rx.subscriptions.Subscriptions;
+import rx.util.functions.Action0;
+import android.view.View;
+import android.widget.CompoundButton;
+
 public class OperatorCompoundButtonInput implements Observable.OnSubscribe<Boolean> {
     private final boolean emitInitialValue;
     private final CompoundButton button;
@@ -36,7 +38,7 @@ public OperatorCompoundButtonInput(final CompoundButton button, final boolean em
     }
 
     @Override
-    public void call(final Observer<? super Boolean> observer) {
+    public void call(final Subscriber<? super Boolean> observer) {
         final CompositeOnCheckedChangeListener composite = CachedListeners.getFromViewOrCreate(button);
 
         final CompoundButton.OnCheckedChangeListener listener = new CompoundButton.OnCheckedChangeListener() {
@@ -46,12 +48,12 @@ public void onCheckedChanged(final CompoundButton button, final boolean checked)
             }
         };
 
-        final Subscription subscription = new Subscription() {
+        final Subscription subscription = Subscriptions.create(new Action0() {
             @Override
-            public void unsubscribe() {
+            public void call() {
                 composite.removeOnCheckedChangeListener(listener);
             }
-        };
+        });
 
         if (emitInitialValue) {
             observer.onNext(button.isChecked());

rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorEditTextInput.java

@@ -15,12 +15,14 @@
  */
 package rx.operators;
 
+import rx.Observable;
+import rx.Subscriber;
+import rx.Subscription;
+import rx.subscriptions.Subscriptions;
+import rx.util.functions.Action0;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.widget.EditText;
-import rx.Observable;
-import rx.Observer;
-import rx.Subscription;
 
 public class OperatorEditTextInput implements Observable.OnSubscribe<String> {
     private final EditText input;
@@ -32,20 +34,20 @@ public OperatorEditTextInput(final EditText input, final boolean emitInitialValu
     }
 
     @Override
-    public void call(final Observer<? super String> observer) {
+    public void call(final Subscriber<? super String> observer) {
         final TextWatcher watcher = new SimpleTextWatcher() {
             @Override
             public void afterTextChanged(final Editable editable) {
                 observer.onNext(editable.toString());
             }
         };
-
-        final Subscription subscription = new Subscription() {
+        
+        final Subscription subscription = Subscriptions.create(new Action0() {
             @Override
-            public void unsubscribe() {
+            public void call() {
                 input.removeTextChangedListener(watcher);
             }
-        };
+        });
 
         if (emitInitialValue) {
             observer.onNext(input.getEditableText().toString());

rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorViewClick.java

@@ -15,15 +15,18 @@
  */
 package rx.operators;
 
-import android.view.View;
-import rx.Observable;
-import rx.Observer;
-import rx.Subscription;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
 
+import rx.Observable;
+import rx.Subscriber;
+import rx.Subscription;
+import rx.subscriptions.Subscriptions;
+import rx.util.functions.Action0;
+import android.view.View;
+
 public final class OperatorViewClick implements Observable.OnSubscribe<View> {
     private final boolean emitInitialValue;
     private final View view;
@@ -34,7 +37,7 @@ public OperatorViewClick(final View view, final boolean emitInitialValue) {
     }
 
     @Override
-    public void call(final Observer<? super View> observer) {
+    public void call(final Subscriber<? super View> observer) {
         final CompositeOnClickListener composite = CachedListeners.getFromViewOrCreate(view);
 
         final View.OnClickListener listener = new View.OnClickListener() {
@@ -44,12 +47,12 @@ public void onClick(final View clicked) {
             }
         };
 
-        final Subscription subscription = new Subscription() {
+        final Subscription subscription = Subscriptions.create(new Action0() {
             @Override
-            public void unsubscribe() {
+            public void call() {
                 composite.removeOnClickListener(listener);
             }
-        };
+        });
 
         if (emitInitialValue) {
             observer.onNext(view);