Merge pull request #65 from grandcentrix/feature/runonmainthread

TiPresenter#runOnUiThread(Runnable)
GCX-HCI · Feb 10, 2017 · 9d41ece · 9d41ece
2 parents 53579df + 5d87cee
commit 9d41ece
Show file tree

Hide file tree

Showing 22 changed files with 578 additions and 123 deletions.
diff --git a/plugin/src/main/java/net/grandcentrix/thirtyinch/plugin/TiActivityPlugin.java b/plugin/src/main/java/net/grandcentrix/thirtyinch/plugin/TiActivityPlugin.java
@@ -29,6 +29,7 @@
 import net.grandcentrix.thirtyinch.internal.TiLoggingTagProvider;
 import net.grandcentrix.thirtyinch.internal.TiPresenterProvider;
 import net.grandcentrix.thirtyinch.internal.TiViewProvider;
+import net.grandcentrix.thirtyinch.internal.UiThreadExecutor;
 import net.grandcentrix.thirtyinch.util.AndroidDeveloperOptions;
 import net.grandcentrix.thirtyinch.util.AnnotationUtil;
 
@@ -39,6 +40,7 @@
 import android.support.annotation.Nullable;
 
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /**
  * Binds a {@link TiPresenter} to an {@link Activity}
@@ -57,6 +59,8 @@ public class TiActivityPlugin<P extends TiPresenter<V>, V extends TiView> extend
 
     private TiActivityDelegate<P, V> mDelegate;
 
+    private final UiThreadExecutor mUiThreadExecutor = new UiThreadExecutor();
+
     /**
      * Binds a {@link TiPresenter} returned by the {@link TiPresenterProvider} to the {@link
      * Activity} and all future {@link Activity} instances created due to configuration changes.
@@ -118,6 +122,11 @@ public P getRetainedPresenter() {
         return null;
     }
 
+    @Override
+    public Executor getUiThreadExecutor() {
+        return mUiThreadExecutor;
+    }
+
     /**
      * Invalidates the cache of the latest bound view. Forces the next binding of the view to run
      * through all the interceptors (again).
@@ -194,11 +203,6 @@ public void onStop() {
         mDelegate.onStop_afterSuper();
     }
 
-    @Override
-    public boolean postToMessageQueue(final Runnable runnable) {
-        return getActivity().getWindow().getDecorView().post(runnable);
-    }
-
     @SuppressWarnings("unchecked")
     @NonNull
     @Override

diff --git a/plugin/src/main/java/net/grandcentrix/thirtyinch/plugin/TiFragmentPlugin.java b/plugin/src/main/java/net/grandcentrix/thirtyinch/plugin/TiFragmentPlugin.java
@@ -29,6 +29,7 @@
 import net.grandcentrix.thirtyinch.internal.TiLoggingTagProvider;
 import net.grandcentrix.thirtyinch.internal.TiPresenterProvider;
 import net.grandcentrix.thirtyinch.internal.TiViewProvider;
+import net.grandcentrix.thirtyinch.internal.UiThreadExecutor;
 import net.grandcentrix.thirtyinch.util.AndroidDeveloperOptions;
 import net.grandcentrix.thirtyinch.util.AnnotationUtil;
 
@@ -41,6 +42,7 @@
 import android.view.ViewGroup;
 
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /**
  * Adds a {@link TiPresenter} to a Fragment. Can be used for both, {@link Fragment} and
@@ -58,6 +60,8 @@ public class TiFragmentPlugin<P extends TiPresenter<V>, V extends TiView> extend
 
     private TiFragmentDelegate<P, V> mDelegate;
 
+    private final UiThreadExecutor mUiThreadExecutor = new UiThreadExecutor();
+
     /**
      * Binds a {@link TiPresenter} returned by the {@link TiPresenterProvider} to the {@link
      * Fragment} and all future {@link Fragment} instances created due to configuration changes.
@@ -99,7 +103,6 @@ public List<BindViewInterceptor> getInterceptors(
         return mDelegate.getInterceptors(predicate);
     }
 
-
     @Override
     public String getLoggingTag() {
         return TAG;
@@ -109,6 +112,11 @@ public P getPresenter() {
         return mDelegate.getPresenter();
     }
 
+    @Override
+    public Executor getUiThreadExecutor() {
+        return mUiThreadExecutor;
+    }
+
     /**
      * Invalidates the cache of the latest bound view. Forces the next binding of the view to run
      * through all the interceptors (again).
@@ -187,11 +195,6 @@ public void onStop() {
         super.onStop();
     }
 
-    @Override
-    public boolean postToMessageQueue(final Runnable runnable) {
-        return getFragment().getActivity().getWindow().getDecorView().post(runnable);
-    }
-
     /**
      * the default implementation assumes that the fragment is the view and implements the {@link
      * TiView} interface. Override this method for a different behaviour.

diff --git a/rx/src/main/java/net/grandcentrix/thirtyinch/rx/RxTiPresenterUtils.java b/rx/src/main/java/net/grandcentrix/thirtyinch/rx/RxTiPresenterUtils.java
@@ -114,40 +114,37 @@ public Observable<T> call(Observable<T> observable) {
      * TiPresenter#attachView(TiView)} and before calling {@link TiPresenter#detachView()}.
      */
     public static Observable<Boolean> isViewReady(final TiPresenter presenter) {
-        return Observable.create(
-                new Observable.OnSubscribe<Boolean>() {
-                    @Override
-                    public void call(final Subscriber<? super Boolean> subscriber) {
-                        if (!subscriber.isUnsubscribed()) {
-                            subscriber.onNext(presenter.getState()
-                                    == TiPresenter.State.VIEW_ATTACHED);
-                        }
-
-                        final Removable removable = presenter
-                                .addLifecycleObserver(new TiLifecycleObserver() {
-                                    @Override
-                                    public void onChange(final TiPresenter.State state,
-                                            final boolean hasLifecycleMethodBeenCalled) {
-                                        if (!subscriber.isUnsubscribed()) {
-                                            subscriber.onNext(state
-                                                    == TiPresenter.State.VIEW_ATTACHED);
-                                        }
-                                    }
-                                });
-
-                        subscriber.add(new Subscription() {
-                            @Override
-                            public boolean isUnsubscribed() {
-                                return removable.isRemoved();
-                            }
+        return Observable.create(new Observable.OnSubscribe<Boolean>() {
+            @Override
+            public void call(final Subscriber<? super Boolean> subscriber) {
+                if (!subscriber.isUnsubscribed()) {
+                    subscriber.onNext(presenter.getState() == TiPresenter.State.VIEW_ATTACHED);
+                }
 
+                final Removable removable = presenter
+                        .addLifecycleObserver(new TiLifecycleObserver() {
                             @Override
-                            public void unsubscribe() {
-                                removable.remove();
+                            public void onChange(final TiPresenter.State state,
+                                    final boolean hasLifecycleMethodBeenCalled) {
+                                if (!subscriber.isUnsubscribed()) {
+                                    subscriber.onNext(state == TiPresenter.State.VIEW_ATTACHED
+                                            && hasLifecycleMethodBeenCalled);
+                                }
                             }
                         });
+
+                subscriber.add(new Subscription() {
+                    @Override
+                    public boolean isUnsubscribed() {
+                        return removable.isRemoved();
+                    }
+
+                    @Override
+                    public void unsubscribe() {
+                        removable.remove();
                     }
-                })
-                .distinctUntilChanged();
+                });
+            }
+        }).distinctUntilChanged();
     }
 }
diff --git a/rx2/src/main/java/net/grandcentrix/thirtyinch/rx2/RxTiPresenterUtils.java b/rx2/src/main/java/net/grandcentrix/thirtyinch/rx2/RxTiPresenterUtils.java
@@ -32,42 +32,39 @@ public class RxTiPresenterUtils {
      * TiPresenter#attachView(TiView)} and before calling {@link TiPresenter#detachView()}.
      */
     public static Observable<Boolean> isViewReady(final TiPresenter presenter) {
-        return Observable.create(
-                new ObservableOnSubscribe<Boolean>() {
-                    @Override
-                    public void subscribe(final ObservableEmitter<Boolean> emitter)
-                            throws Exception {
-                        if (!emitter.isDisposed()) {
-                            emitter.onNext(presenter.getState()
-                                    == TiPresenter.State.VIEW_ATTACHED);
-                        }
-
-                        final Removable removable = presenter
-                                .addLifecycleObserver(new TiLifecycleObserver() {
-                                    @Override
-                                    public void onChange(final TiPresenter.State state,
-                                            final boolean hasLifecycleMethodBeenCalled) {
-                                        if (!emitter.isDisposed()) {
-                                            emitter.onNext(state ==
-                                                    TiPresenter.State.VIEW_ATTACHED);
-                                        }
-                                    }
-                                });
-
-                        emitter.setDisposable(new Disposable() {
-                            @Override
-                            public void dispose() {
-                                removable.remove();
-                            }
+        return Observable.create(new ObservableOnSubscribe<Boolean>() {
+            @Override
+            public void subscribe(final ObservableEmitter<Boolean> emitter)
+                    throws Exception {
+                if (!emitter.isDisposed()) {
+                    emitter.onNext(presenter.getState() == TiPresenter.State.VIEW_ATTACHED);
+                }
 
+                final Removable removable = presenter
+                        .addLifecycleObserver(new TiLifecycleObserver() {
                             @Override
-                            public boolean isDisposed() {
-                                return removable.isRemoved();
+                            public void onChange(final TiPresenter.State state,
+                                    final boolean hasLifecycleMethodBeenCalled) {
+                                if (!emitter.isDisposed()) {
+                                    emitter.onNext(state == TiPresenter.State.VIEW_ATTACHED
+                                            && hasLifecycleMethodBeenCalled);
+                                }
                             }
                         });
+
+                emitter.setDisposable(new Disposable() {
+                    @Override
+                    public void dispose() {
+                        removable.remove();
+                    }
+
+                    @Override
+                    public boolean isDisposed() {
+                        return removable.isRemoved();
                     }
-                })
-                .distinctUntilChanged();
+                });
+            }
+        }).distinctUntilChanged();
     }
 
 }
diff --git a/sample/src/main/java/net/grandcentrix/thirtyinch/sample/HelloWorldPresenter.java b/sample/src/main/java/net/grandcentrix/thirtyinch/sample/HelloWorldPresenter.java
@@ -16,6 +16,7 @@
 package net.grandcentrix.thirtyinch.sample;
 
 import net.grandcentrix.thirtyinch.TiPresenter;
+import net.grandcentrix.thirtyinch.ViewAction;
 import net.grandcentrix.thirtyinch.rx.RxTiPresenterSubscriptionHandler;
 import net.grandcentrix.thirtyinch.rx.RxTiPresenterUtils;
 
@@ -73,7 +74,12 @@ protected void onCreate() {
                 .subscribe(new Action1<Long>() {
                     @Override
                     public void call(final Long uptime) {
-                        getView().showPresenterUpTime(uptime);
+                        sendToView(new ViewAction<HelloWorldView>() {
+                            @Override
+                            public void call(final HelloWorldView view) {
+                                view.showPresenterUpTime(uptime);
+                            }
+                        });
                     }
                 }));
 

diff --git a/sample/src/main/java/net/grandcentrix/thirtyinch/sample/HelloWorldView.java b/sample/src/main/java/net/grandcentrix/thirtyinch/sample/HelloWorldView.java
@@ -25,7 +25,6 @@ public interface HelloWorldView extends TiView {
 
     Observable<Void> onButtonClicked();
 
-    @CallOnMainThread
     void showPresenterUpTime(Long uptime);
 
     @CallOnMainThread

diff --git a/test/src/main/java/net/grandcentrix/thirtyinch/test/TiPresenterInstructor.java b/test/src/main/java/net/grandcentrix/thirtyinch/test/TiPresenterInstructor.java
@@ -18,6 +18,8 @@
 import net.grandcentrix.thirtyinch.TiPresenter;
 import net.grandcentrix.thirtyinch.TiView;
 
+import java.util.concurrent.Executor;
+
 public class TiPresenterInstructor<V extends TiView> {
 
     private TiPresenter<V> mPresenter;
@@ -32,6 +34,12 @@ public TiPresenterInstructor(final TiPresenter<V> presenter) {
     public void attachView(final V view) {
         detachView();
 
+        mPresenter.setUiThreadExecutor(new Executor() {
+            @Override
+            public void execute(final Runnable action) {
+                action.run();
+            }
+        });
         mPresenter.attachView(view);
     }
 
@@ -59,6 +67,7 @@ public void detachView() {
                 break;
             case VIEW_ATTACHED:
                 mPresenter.detachView();
+                mPresenter.setUiThreadExecutor(null);
                 break;
             case DESTROYED:
                 throw new IllegalStateException(

diff --git a/...nch/src/androidTest/java/net/grandcentrix/thirtyinch/internal/TiActivityDelegateTest.java b/...nch/src/androidTest/java/net/grandcentrix/thirtyinch/internal/TiActivityDelegateTest.java
@@ -29,6 +29,8 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import java.util.concurrent.Executor;
+
 import static junit.framework.Assert.assertEquals;
 
 @RunWith(AndroidJUnit4.class)
@@ -239,9 +241,13 @@ public boolean isDontKeepActivitiesEnabled() {
                     }
 
                     @Override
-                    public boolean postToMessageQueue(final Runnable action) {
-                        action.run();
-                        return true;
+                    public Executor getUiThreadExecutor() {
+                        return new Executor() {
+                            @Override
+                            public void execute(@NonNull final Runnable action) {
+                                action.run();
+                            }
+                        };
                     }
                 },
                 new TiViewProvider<TiView>() {

diff --git a/thirtyinch/src/main/java/net/grandcentrix/thirtyinch/TiActivity.java b/thirtyinch/src/main/java/net/grandcentrix/thirtyinch/TiActivity.java
@@ -22,6 +22,7 @@
 import net.grandcentrix.thirtyinch.internal.TiLoggingTagProvider;
 import net.grandcentrix.thirtyinch.internal.TiPresenterProvider;
 import net.grandcentrix.thirtyinch.internal.TiViewProvider;
+import net.grandcentrix.thirtyinch.internal.UiThreadExecutor;
 import net.grandcentrix.thirtyinch.util.AndroidDeveloperOptions;
 import net.grandcentrix.thirtyinch.util.AnnotationUtil;
 
@@ -32,6 +33,7 @@
 import android.support.v7.app.AppCompatActivity;
 
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /**
  * Created by pascalwelsch on 9/8/15.
@@ -48,6 +50,8 @@ public abstract class TiActivity<P extends TiPresenter<V>, V extends TiView>
     private final TiActivityDelegate<P, V> mDelegate
             = new TiActivityDelegate<>(this, this, this, this);
 
+    private final UiThreadExecutor mUiThreadExecutor = new UiThreadExecutor();
+
     @NonNull
     @Override
     public Removable addBindViewInterceptor(@NonNull final BindViewInterceptor interceptor) {
@@ -90,6 +94,11 @@ public P getRetainedPresenter() {
         return null;
     }
 
+    @Override
+    public Executor getUiThreadExecutor() {
+        return mUiThreadExecutor;
+    }
+
     /**
      * Invalidates the cache of the latest bound view. Forces the next binding of the view to run
      * through all the interceptors (again).
@@ -136,11 +145,6 @@ public Object onRetainCustomNonConfigurationInstance() {
         return null;
     }
 
-    @Override
-    public boolean postToMessageQueue(final Runnable runnable) {
-        return getWindow().getDecorView().post(runnable);
-    }
-
     @SuppressWarnings("unchecked")
     @NonNull
     @Override