app/src/main/java/ai/pai/lensman/session/SessionInteractor.java

@@ -37,7 +37,7 @@ public class SessionInteractor {

                     private String randomSessionId;
              

                     private long maxId = 0;
              

                     private boolean isWorking;
              

                -
              

                +    private boolean isLastQueryReturned = true;
              

                     private static final String TAG = "SessionInteractor";
              

                 
              

                         public SessionInteractor(SessionBean sessionBean, SessionListener listener) {
              
@@ -128,6 +128,9 @@ public class SessionInteractor {

                         if(!isWorking){
              

                             return;
              

                         }
              

                +        if(!isLastQueryReturned){
              

                +            return;
              

                +        }
              

                 
              

                         if(BuildConfig.isTestMode){
              

                             PhotoBean bean = new PhotoBean();
              
@@ -202,11 +205,13 @@ public class SessionInteractor {

                             protected void onPostFail() {
              

                                 LogHelper.d(TAG,"fetchThumbnailTask onPostFail");
              

                                 super.onPostFail();
              

                +                isLastQueryReturned = true;
              

                             }
              

                 
              

                             @Override
              

                             protected void onPostSuccess() {
              

                                 super.onPostSuccess();
              

                +                isLastQueryReturned = true;
              

                                 LogHelper.d(TAG,"fetchThumbnailTask onPostSuccess with photo number = "+photoList.size());
              

                                 for(PhotoBean bean :photoList){
              

                                     new SavePhotoTask(bean).executeOnExecutor(ThreadExecutor.getInstance().getExecutor(),bean);
              
@@ -215,6 +220,7 @@ public class SessionInteractor {

                             }
              

                         };
              

                         fetchThumbnailTask.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), BoxUrlContainer.FETCH_THUMBNAIL_URL);
              

                +        isLastQueryReturned = false;
              

                         LogHelper.d(TAG,"fetchThumbnailTask starts");
              

                     }