Add more error callbacks (#21)

* Add more error callbacks * Fix a bug in returning a error message * Expose a variable to provide information whether to load more data * Remove unnecessary configs
pixlee · Feb 13, 2020 · 54c85f2 · 54c85f2
1 parent b4fc688
commit 54c85f2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/pixleesdk/build.gradle b/pixleesdk/build.gradle
@@ -8,9 +8,6 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.2.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
@@ -26,8 +23,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.json:json:20160810'
 

diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java
@@ -1,11 +1,11 @@
 package com.pixlee.pixleesdk;
 
-import android.util.Log;
-
 import com.pixlee.pixleesdk.data.PhotoResult;
 import com.pixlee.pixleesdk.data.repository.AnalyticsDataSource;
 import com.pixlee.pixleesdk.data.repository.BasicDataSource;
 
+import java.util.ArrayList;
+
 import retrofit2.Call;
 
 /***
@@ -47,18 +47,20 @@ public PXLAlbum(String id, PXLClient client) {
      * This is for unit test. Not for the use
      * @return
      */
-    Call<PhotoResult> makeGetAlbumCall() {
+    @Override
+    Call<PhotoResult> makeGetAlbumCall(RequestHandlers<ArrayList<PXLPhoto>> handlers) {
         if (album_id == null) {
-            Log.w(TAG, "No album id specified");
+            handlers.onError("No album id specified");
             return null;
         }
         if (!this.hasMore) {
+            handlers.onError("No need to load more");
             return null;
         }
 
         int desiredPage = this.lastPageLoaded + 1;
         if (pagesLoading.get(desiredPage) != null && pagesLoading.get(desiredPage)) {
-            Log.d(TAG, String.format("page %s already loading", desiredPage));
+            handlers.onError(String.format("page %s already loading", desiredPage));
             return null;
         }
         this.pagesLoading.put(desiredPage, true);

diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLBaseAlbum.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLBaseAlbum.java
@@ -13,7 +13,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
 import okhttp3.ResponseBody;
 import retrofit2.Call;
@@ -65,6 +64,14 @@ public PXLBaseAlbum(BasicDataSource basicRepo, AnalyticsDataSource analyticsRepo
         this.pagesLoading = new HashMap<>();
     }
 
+    /**
+     * Gives hint for you whether to use loadNextPageOfPhotos()
+     * @return hasMore  true: you can fire loadNextPageOfPhotos() to get more data,    false: you cannot load more data
+     */
+    public boolean isHasMore() {
+        return hasMore;
+    }
+
     /***
      * Sets the amount of photos fetched per call of 'loadNextPageOfPhotos'.  Will purge previously
      * fetched photos. Call 'loadNextPageOfPhotos' after setting.
@@ -136,16 +143,15 @@ public <T> void processReponse(Response response, RequestHandlers handlers){
      *
      * @return retrofit2.Call
      */
-    abstract Call<PhotoResult> makeGetAlbumCall();
+    abstract Call<PhotoResult> makeGetAlbumCall(RequestHandlers<ArrayList<PXLPhoto>> handlers);
 
     /***
      * Requests the next page of photos from the Pixlee album. Make sure to set perPage,
      * sort order, and filter options before calling.
      * @param handlers - called upon success/failure of the request
-     * @return true if the request was attempted, false if aborted before the attempt was made
      */
     public void loadNextPageOfPhotos(final RequestHandlers<ArrayList<PXLPhoto>> handlers) {
-        Call<PhotoResult> call = makeGetAlbumCall();
+        Call<PhotoResult> call = makeGetAlbumCall(handlers);
 
         if (call == null)
             return;

diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLPdpAlbum.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLPdpAlbum.java
@@ -1,11 +1,11 @@
 package com.pixlee.pixleesdk;
 
-import android.util.Log;
-
 import com.pixlee.pixleesdk.data.PhotoResult;
 import com.pixlee.pixleesdk.data.repository.AnalyticsDataSource;
 import com.pixlee.pixleesdk.data.repository.BasicDataSource;
 
+import java.util.ArrayList;
+
 import retrofit2.Call;
 
 /**
@@ -42,20 +42,20 @@ public PXLPdpAlbum(String sku, PXLClient client) {
      * @return
      */
     @Override
-    Call<PhotoResult> makeGetAlbumCall() {
+    Call<PhotoResult> makeGetAlbumCall(RequestHandlers<ArrayList<PXLPhoto>> handlers) {
         if (sku == null) {
-            Log.w(TAG, "No sku specified");
+            handlers.onError("No sku specified");
             return null;
         }
         if (!this.hasMore) {
-            Log.w(TAG, "no need to load more");
+            handlers.onError("No need to load more");
             return null;
         }
 
         int desiredPage = this.lastPageLoaded + 1;
         Boolean isPageLoading = pagesLoading.get(desiredPage);
         if (isPageLoading != null && isPageLoading) {
-            Log.d(TAG, String.format("page %s already loading", desiredPage));
+            handlers.onError(String.format("page %s already loading", desiredPage));
             return null;
         }