Skip to content

Commit 2c9a406

Browse files
committed
Merge pull request ReactiveX#61 from omo/tidyup
Some trivial cleanup
2 parents 234fe10 + 8b294b9 commit 2c9a406

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

rxandroid/src/main/java/rx/android/observables/AndroidObservable.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ private AndroidObservable() {
7373

7474
/**
7575
* Binds the given source sequence to an activity.
76-
* <p/>
76+
* <p>
7777
* This helper will schedule the given sequence to be observed on the main UI thread and ensure
7878
* that no notifications will be forwarded to the activity in case it is scheduled to finish.
79-
* <p/>
79+
* <p>
8080
* You should unsubscribe from the returned Observable in onDestroy at the latest, in order to not
8181
* leak the activity or an inner subscriber. Conversely, when the source sequence can outlive the activity,
8282
* make sure to bind to new instances of the activity again, e.g. after going through configuration changes.
@@ -87,16 +87,16 @@ private AndroidObservable() {
8787
*/
8888
public static <T> Observable<T> bindActivity(Activity activity, Observable<T> source) {
8989
Assertions.assertUiThread();
90-
return source.observeOn(mainThread()).lift(new OperatorConditionalBinding<T, Activity>(activity, ACTIVITY_VALIDATOR));
90+
return source.lift(new OperatorConditionalBinding<T, Activity>(activity, ACTIVITY_VALIDATOR)).observeOn(mainThread());
9191
}
9292

9393
/**
9494
* Binds the given source sequence to a fragment (native or support-v4).
95-
* <p/>
95+
* <p>
9696
* This helper will schedule the given sequence to be observed on the main UI thread and ensure
9797
* that no notifications will be forwarded to the fragment in case it gets detached from its
9898
* activity or the activity is scheduled to finish.
99-
* <p/>
99+
* <p>
100100
* You should unsubscribe from the returned Observable in onDestroy for normal fragments, or in onDestroyView
101101
* for retained fragments, in order to not leak any references to the host activity or the fragment.
102102
* Refer to the samples project for actual examples.

rxandroid/src/main/java/rx/android/operators/OperatorConditionalBinding.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* Ties a source sequence to the given target object using a predicate. If the predicate fails
2525
* to validate, the sequence unsubscribes itself and releases the bound reference.
26-
* <p/>
26+
* <p>
2727
* You can also pass in an optional predicate function, which whenever it evaluates to false
2828
* on the target object, will also result in the operator unsubscribing from the sequence.
2929
*

0 commit comments

Comments
 (0)