From ee3d63d54bedc95c76f8188fdd41faed1fdf8110 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Tue, 31 May 2016 16:27:42 +0300
Subject: [PATCH] [android][booking] fix: Review fixes.

---
 .../maps/downloader/MigrationFragment.java       |  2 +-
 .../maps/widget/placepage/PlacePageButtons.java  | 16 ++++++++--------
 .../maps/widget/placepage/PlacePageView.java     |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/android/src/com/mapswithme/maps/downloader/MigrationFragment.java b/android/src/com/mapswithme/maps/downloader/MigrationFragment.java
index edbad99839..3f3c1dbbdc 100644
--- a/android/src/com/mapswithme/maps/downloader/MigrationFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/MigrationFragment.java
@@ -68,7 +68,7 @@ public class MigrationFragment extends BaseMwmFragment
           return;
 
         if (getActivity() instanceof MwmActivity)
-          ((MwmActivity)getActivity()).closeSidePanel();
+          ((MwmActivity) getActivity()).closeSidePanel();
         else
           getActivity().finish();
       }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
index 8895239e72..bb4160330e 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
@@ -1,3 +1,4 @@
+
 package com.mapswithme.maps.widget.placepage;
 
 import android.support.annotation.DrawableRes;
@@ -196,27 +197,26 @@ final class PlacePageButtons
     bs.tint().show();
   }
 
-  private View createButton(final List<Item> items, int id)
+  private View createButton(final List<Item> items, final Item current)
   {
-    final Item item = items.get(id);
     View res = LayoutInflater.from(mPlacePage.getContext()).inflate(R.layout.place_page_button, mFrame, false);
 
     ImageView icon = (ImageView) res.findViewById(R.id.icon);
     TextView title = (TextView) res.findViewById(R.id.title);
 
-    icon.setImageResource(item.getIcon());
-    title.setText(item.getTitle());
-    mItemListener.onPrepareVisibleView(item, res, icon, title);
+    icon.setImageResource(current.getIcon());
+    title.setText(current.getTitle());
+    mItemListener.onPrepareVisibleView(current, res, icon, title);
 
     res.setOnClickListener(new View.OnClickListener()
     {
       @Override
       public void onClick(View v)
       {
-        if (item == Item.MORE)
+        if (current == Item.MORE)
           showPopup(items);
         else
-          mItemListener.onItemClick(item);
+          mItemListener.onItemClick(current);
       }
     });
 
@@ -233,7 +233,7 @@ final class PlacePageButtons
     mFrame.removeAllViews();
     int count = Math.min(buttons.size(), MAX_BUTTONS);
     for (int i = 0; i < count; i++)
-      mFrame.addView(createButton(buttons, i));
+      mFrame.addView(createButton(buttons, buttons.get(i)));
 
     mPrevItems = buttons;
   }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index ddce9b9761..acf3a44a57 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -362,7 +362,8 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
               request.setPointData(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getTitle(), "");
 
             request.sendResponseAndFinish(getActivity(), true);
-          } else
+          }
+          else
             getActivity().finish();
           break;