Fix the bug of create AsyncDataProvider.

Add a new constructor of AsyncDataProvider. Add exception of calling setData int PageDataProvider directly.
kifile · Sep 20, 2015 · 5b6eae3 · 5b6eae3
1 parent b84b225
commit 5b6eae3
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/AsyncDataProvider.java b/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/AsyncDataProvider.java
@@ -3,30 +3,45 @@
 import com.kifile.android.cornerstone.core.DataProvider;
 import com.kifile.android.cornerstone.utils.WorkerThreadPool;
 
+import java.util.concurrent.Executor;
+
 /**
  * Fetch Data on a no-ui thread.
  *
  * @author kifile
  */
 public class AsyncDataProvider<DATA> extends DecoratorDataProvider<DATA> {
 
-    private AsyncDataProvider(DataProvider<DATA> proxy) {
+    private Executor mExecutor;
+
+    public AsyncDataProvider(DataProvider<DATA> proxy) {
+        super(proxy);
+    }
+
+    public AsyncDataProvider(DataProvider<DATA> proxy, Executor executor) {
         super(proxy);
+        mExecutor = executor;
     }
 
     private WorkerThreadPool.WorkerRunnable mWorker;
 
+    private final Runnable mSuperRefresh = new Runnable() {
+        @Override
+        public void run() {
+            AsyncDataProvider.super.refresh();
+        }
+    };
+
     @Override
     public void refresh() {
-        if (mWorker != null) {
-            mWorker.cancel();
-        }
-        mWorker = WorkerThreadPool.getInstance().execute(new Runnable() {
-            @Override
-            public void run() {
-                AsyncDataProvider.super.refresh();
+        if (mExecutor != null) {
+            mExecutor.execute(mSuperRefresh);
+        } else {
+            if (mWorker != null) {
+                mWorker.cancel();
             }
-        });
+            mWorker = WorkerThreadPool.getInstance().execute(mSuperRefresh);
+        }
     }
 
     @Override

diff --git a/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/PageDataProvider.java b/framework/src/main/java/com/kifile/android/cornerstone/impl/providers/PageDataProvider.java
@@ -20,6 +20,15 @@ public boolean isDataNeedUpdate() {
         return page != null && page.page == 0;
     }
 
+    @Override
+    protected synchronized void setData(PageData<DATA> dataPageData) {
+        throw new RuntimeException("Should call #setPageData to setData");
+    }
+
+    public void setPageData(int page, DATA data) {
+        super.setData(new PageData<>(page, data));
+    }
+
     public static class PageData<DATA> {
 
         public int page;