Check if listener is disposed in viewattacheventsobservable

ZacSweers · ZacSweers · commit 22ba6835e9ed · 2017-11-27T03:44:31.000-08:00
diff --git a/android/autodispose-android/src/main/java/com/uber/autodispose/android/ViewAttachEventsObservable.java b/android/autodispose-android/src/main/java/com/uber/autodispose/android/ViewAttachEventsObservable.java
@@ -49,6 +49,9 @@ final class ViewAttachEventsObservable extends Observable<ViewLifecycleEvent> {
       observer.onNext(ViewLifecycleEvent.ATTACH);
     }
     view.addOnAttachStateChangeListener(listener);
+    if (listener.isDisposed()) {
+      view.removeOnAttachStateChangeListener(listener);
+    }
   }
 
   static final class Listener extends MainThreadDisposable

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ final class ViewAttachEventsObservable extends Observable<ViewLifecycleEvent> {`
`49`	`49`	`observer.onNext(ViewLifecycleEvent.ATTACH);`
`50`	`50`	`}`
`51`	`51`	`view.addOnAttachStateChangeListener(listener);`
	`52`	`+ if (listener.isDisposed()) {`
	`53`	`+ view.removeOnAttachStateChangeListener(listener);`
	`54`	`+ }`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`static final class Listener extends MainThreadDisposable`