From 564670a25e07b69488149cb41c54f92a1b082ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Wed, 29 Nov 2017 16:06:28 +0300
Subject: [PATCH] [android] Added error handling for viator gallery on
 Discovery screen

---
 .../maps/base/BaseSponsoredAdapter.java       | 41 +++++++++----------
 .../maps/discovery/DiscoveryFragment.java     | 16 ++++++++
 .../maps/discovery/DiscoveryManager.java      |  3 +-
 .../mapswithme/maps/discovery/UICallback.java |  2 +
 .../maps/widget/placepage/PlacePageView.java  | 11 +++--
 5 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java b/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java
index facc542004..0715d35452 100644
--- a/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java
+++ b/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java
@@ -16,7 +16,6 @@ import android.widget.TextView;
 
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
-import com.mapswithme.maps.widget.placepage.Sponsored;
 import com.mapswithme.util.UiUtils;
 
 import java.lang.annotation.Retention;
@@ -31,7 +30,7 @@ public abstract class BaseSponsoredAdapter extends RecyclerView.Adapter<BaseSpon
   protected static final int TYPE_PRODUCT = 0;
   private static final int TYPE_MORE = 1;
   protected static final int TYPE_LOADING = 2;
-  public static final int TYPE_OFFLINE_MESSAGE = 3;
+  protected static final int TYPE_OFFLINE_MESSAGE = 3;
 
   private static final String MORE = MwmApplication.get().getString(R.string.placepage_more_button);
   private static final int TARGET_LOAD_WIDTH = UiUtils.dimen(MwmApplication.get(),
@@ -115,7 +114,7 @@ public abstract class BaseSponsoredAdapter extends RecyclerView.Adapter<BaseSpon
     return mItems.size() == 1 && mItems.get(0).mType == TYPE_LOADING;
   }
 
-  public void setLoadingError(@Sponsored.SponsoredType int sponsoredType, @NonNull String url)
+  public void setLoadingError(@Nullable String url)
   {
     mItems.clear();
     mItems.add(new Item(TYPE_LOADING, getLoadingTitle(), url, getLoadingSubtitle(),
@@ -123,7 +122,7 @@ public abstract class BaseSponsoredAdapter extends RecyclerView.Adapter<BaseSpon
     notifyItemChanged(0/* position */);
   }
 
-  public void setLoadingCompleted(@Sponsored.SponsoredType int sponsoredType, @NonNull String url)
+  public void setLoadingCompleted(@NonNull String url)
   {
     mItems.clear();
     mItems.add(new Item(TYPE_LOADING, getLoadingTitle(), url, getLoadingSubtitle(),
@@ -212,13 +211,13 @@ public abstract class BaseSponsoredAdapter extends RecyclerView.Adapter<BaseSpon
 
     void onItemSelected(@NonNull Item item)
     {
-      if (mAdapter.mListener != null && !TextUtils.isEmpty(item.mUrl))
-      {
-        if (item.mType == TYPE_PRODUCT)
-          mAdapter.mListener.onItemSelected(item.mUrl);
-        else if (item.mType == TYPE_MORE || item.mType == TYPE_LOADING)
-          mAdapter.mListener.onMoreItemSelected(item.mUrl);
-      }
+      if (mAdapter.mListener == null || TextUtils.isEmpty(item.mUrl))
+        return;
+
+      if (item.mType == TYPE_PRODUCT)
+        mAdapter.mListener.onItemSelected(item.mUrl);
+      else if (item.mType == TYPE_MORE || item.mType == TYPE_LOADING)
+        mAdapter.mListener.onMoreItemSelected(item.mUrl);
     }
   }
 
@@ -232,7 +231,7 @@ public abstract class BaseSponsoredAdapter extends RecyclerView.Adapter<BaseSpon
     @NonNull
     TextView mMore;
 
-    public LoadingViewHolder(@NonNull View itemView, @NonNull BaseSponsoredAdapter adapter)
+    LoadingViewHolder(@NonNull View itemView, @NonNull BaseSponsoredAdapter adapter)
     {
       super(itemView, adapter);
       mProgressBar = (ProgressBar) itemView.findViewById(R.id.pb__progress);
@@ -271,15 +270,15 @@ public abstract class BaseSponsoredAdapter extends RecyclerView.Adapter<BaseSpon
 
     void onItemSelected(@NonNull Item item)
     {
-      if (mAdapter.mListener != null && !TextUtils.isEmpty(item.mUrl))
-      {
-        if (item.mType == TYPE_PRODUCT)
-          mAdapter.mListener.onItemSelected(item.mUrl);
-        else if (item.mType == TYPE_MORE)
-          mAdapter.mListener.onMoreItemSelected(item.mUrl);
-        else if (item.mType == TYPE_LOADING && item.mLoadingError)
-          mAdapter.mListener.onItemSelected(item.mUrl);
-      }
+      if (mAdapter.mListener == null || TextUtils.isEmpty(item.mUrl))
+        return;
+
+      if (item.mType == TYPE_PRODUCT)
+        mAdapter.mListener.onItemSelected(item.mUrl);
+      else if (item.mType == TYPE_MORE)
+        mAdapter.mListener.onMoreItemSelected(item.mUrl);
+      else if (item.mType == TYPE_LOADING && item.mLoadingError)
+        mAdapter.mListener.onItemSelected(item.mUrl);
     }
   }
 
diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
index 42c5d79695..6d5f616547 100644
--- a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
+++ b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmToolbarFragment;
+import com.mapswithme.maps.base.BaseSponsoredAdapter;
 import com.mapswithme.maps.search.SearchResult;
 import com.mapswithme.maps.viator.ViatorProduct;
 import com.mapswithme.maps.widget.recycler.ItemDecoratorFactory;
@@ -149,4 +150,19 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements UICallb
   {
 
   }
+
+  @Override
+  public void onError(@NonNull ItemType type)
+  {
+    switch (type)
+    {
+      case VIATOR:
+        if (mThingsToDo.getAdapter() != null)
+          // TODO: pass cityUrl instead of null.
+          ((BaseSponsoredAdapter) mThingsToDo.getAdapter()).setLoadingError(null);
+        break;
+
+      // TODO: processing for other adapters is coming soon.
+    }
+  }
 }
diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java b/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java
index 48ea618ec1..5be1c30131 100644
--- a/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java
+++ b/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java
@@ -71,7 +71,8 @@ enum  DiscoveryManager
   private void onError(@DiscoveryParams.ItemType int type)
   {
     LOGGER.w(TAG, "onError for type: " + type);
-    // TODO: not implemented yet.
+    if (mCallback != null)
+      mCallback.onError(ItemType.values()[type]);
   }
 
   void attach(@NonNull UICallback callback)
diff --git a/android/src/com/mapswithme/maps/discovery/UICallback.java b/android/src/com/mapswithme/maps/discovery/UICallback.java
index f45f6b9f45..2da2ae37a2 100644
--- a/android/src/com/mapswithme/maps/discovery/UICallback.java
+++ b/android/src/com/mapswithme/maps/discovery/UICallback.java
@@ -17,4 +17,6 @@ public interface UICallback
   void onViatorProductsReceived(@Nullable ViatorProduct[] products);
   @MainThread
   void onLocalExpertsReceived(@Nullable LocalExpert[] experts);
+  @MainThread
+  void onError(@NonNull ItemType type);
 }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index eba81ed56b..3020b355fb 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -847,8 +847,7 @@ public class PlacePageView extends RelativeLayout
     }
     else
     {
-      mSponsoredAdapter.setLoadingError(Sponsored.TYPE_CIAN,
-                                        mSponsored != null ? mSponsored.getUrl() : "");
+      mSponsoredAdapter.setLoadingError(mSponsored != null ? mSponsored.getUrl() : "");
     }
     Statistics.INSTANCE.trackSponsoredGalleryError(Sponsored.TYPE_CIAN, String.valueOf(errorCode));
   }
@@ -879,7 +878,7 @@ public class PlacePageView extends RelativeLayout
       }
       else
       {
-        mSponsoredAdapter.setLoadingError(Sponsored.TYPE_VIATOR, cityUrl);
+        mSponsoredAdapter.setLoadingError(cityUrl);
       }
       Statistics.INSTANCE.trackSponsoredGalleryError(Sponsored.TYPE_VIATOR,
                                                      Statistics.ParamValue.NO_PRODUCTS);
@@ -902,7 +901,7 @@ public class PlacePageView extends RelativeLayout
             mRvSponsoredProducts.setAdapter(mSponsoredAdapter);
           }
         });
-        mSponsoredAdapter.setLoadingCompleted(Sponsored.TYPE_VIATOR, cityUrl);
+        mSponsoredAdapter.setLoadingCompleted(cityUrl);
       }
     }
   }
@@ -918,7 +917,7 @@ public class PlacePageView extends RelativeLayout
       }
       else
       {
-        mSponsoredAdapter.setLoadingError(Sponsored.TYPE_CIAN, url);
+        mSponsoredAdapter.setLoadingError(url);
       }
       Statistics.INSTANCE.trackSponsoredGalleryError(Sponsored.TYPE_CIAN,
                                                      Statistics.ParamValue.NO_PRODUCTS);
@@ -941,7 +940,7 @@ public class PlacePageView extends RelativeLayout
             mRvSponsoredProducts.setAdapter(mSponsoredAdapter);
           }
         });
-        mSponsoredAdapter.setLoadingCompleted(Sponsored.TYPE_VIATOR, url);
+        mSponsoredAdapter.setLoadingCompleted(url);
       }
     }
   }