Skip to content

Commit d49cd1e

Browse files
committed
remove main thread unsubscribe, fix LocalBroadcastOperatorTest
1 parent 629acad commit d49cd1e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import rx.Observable;
2525
import rx.Subscriber;
2626
import rx.Subscription;
27-
import rx.android.subscriptions.AndroidSubscriptions;
2827
import rx.functions.Action0;
28+
import rx.subscriptions.Subscriptions;
2929

3030
public class OperatorBroadcastRegister implements Observable.OnSubscribe<Intent> {
3131

@@ -50,7 +50,7 @@ public void onReceive(Context context, Intent intent) {
5050
}
5151
};
5252

53-
final Subscription subscription = AndroidSubscriptions.unsubscribeInUiThread(new Action0() {
53+
final Subscription subscription = Subscriptions.create(new Action0() {
5454
@Override
5555
public void call() {
5656
context.unregisterReceiver(broadcastReceiver);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import rx.Subscription;
2727
import rx.android.subscriptions.AndroidSubscriptions;
2828
import rx.functions.Action0;
29+
import rx.subscriptions.Subscriptions;
2930

3031
public class OperatorLocalBroadcastRegister implements Observable.OnSubscribe<Intent> {
3132

@@ -47,7 +48,7 @@ public void onReceive(Context context, Intent intent) {
4748
}
4849
};
4950

50-
final Subscription subscription = AndroidSubscriptions.unsubscribeInUiThread(new Action0() {
51+
final Subscription subscription = Subscriptions.create(new Action0() {
5152
@Override
5253
public void call() {
5354
localBroadcastManager.unregisterReceiver(broadcastReceiver);

rxjava-contrib/rxjava-android/src/test/java/rx/android/operators/OperatorLocalBroadcastRegisterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
public class OperatorLocalBroadcastRegisterTest {
4343

4444
@Test
45-
@SuppressWarnings("unchecked")
4645
public void testLocalBroadcast() {
4746
String action = "TEST_ACTION";
4847
IntentFilter intentFilter = new IntentFilter(action);
@@ -64,6 +63,7 @@ public void testLocalBroadcast() {
6463
inOrder.verify(observer, times(1)).onNext(intent);
6564

6665
subscription.unsubscribe();
66+
localBroadcastManager.sendBroadcast(intent);
6767
inOrder.verify(observer, never()).onNext(any(Intent.class));
6868

6969
inOrder.verify(observer, never()).onError(any(Throwable.class));

0 commit comments

Comments
 (0)