From 9f2a8183bfcfcc232ed6f463d94c6ee1195e3922 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: Sat, 14 Mar 2020 11:01:42 +0300
Subject: [PATCH] [android] Fixed orientation changing for elevation profile
 place page

---
 .../com/mapswithme/maps/bookmarks/data/ElevationInfo.java   | 2 +-
 .../src/com/mapswithme/maps/bookmarks/data/MapObject.java   | 3 +--
 .../maps/widget/placepage/ElevationProfileViewRenderer.java | 5 ++---
 .../maps/widget/placepage/PlacePageControllerComposite.java | 6 +++---
 .../mapswithme/maps/widget/placepage/PlacePageUtils.java    | 2 +-
 .../maps/widget/placepage/RichPlacePageController.java      | 4 ++--
 .../mapswithme/maps/widget/placepage/UserMarkInterface.java | 4 +++-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/android/src/com/mapswithme/maps/bookmarks/data/ElevationInfo.java b/android/src/com/mapswithme/maps/bookmarks/data/ElevationInfo.java
index ee21782c20..fc139d5f2d 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/ElevationInfo.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/ElevationInfo.java
@@ -11,7 +11,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class ElevationInfo implements Parcelable, UserMarkInterface
+public class ElevationInfo implements UserMarkInterface
 {
   private final long mId;
   @NonNull
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
index e047ab6a74..ddcaaf1722 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
@@ -1,7 +1,6 @@
 package com.mapswithme.maps.bookmarks.data;
 
 import android.os.Parcel;
-import android.os.Parcelable;
 import android.text.TextUtils;
 
 import androidx.annotation.IntDef;
@@ -27,7 +26,7 @@ import java.util.List;
 
 // TODO(yunikkk): Refactor. Displayed information is different from edited information, and it's better to
 // separate them. Simple getters from jni place_page::Info and osm::EditableFeature should be enough.
-public class MapObject implements Parcelable, PopularityProvider, ShareableInfoProvider,
+public class MapObject implements PopularityProvider, ShareableInfoProvider,
                                   UserMarkInterface
 {
   // Order must correspond indexer/map_object.hpp
diff --git a/android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java b/android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java
index b70748cb66..1f50662808 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java
@@ -17,7 +17,6 @@ import java.util.Objects;
 
 public class ElevationProfileViewRenderer implements PlacePageViewRenderer<UserMarkInterface>
 {
-  private static final String EXTRA_ELEVATION_INFO = "extra_elevation_info";
   private static final int MAX_DIFFICULTY_LEVEL = 3;
 
   @SuppressWarnings("NullableProblems")
@@ -100,13 +99,13 @@ public class ElevationProfileViewRenderer implements PlacePageViewRenderer<UserM
   @Override
   public void onSave(@NonNull Bundle outState)
   {
-    outState.putParcelable(EXTRA_ELEVATION_INFO, mElevationInfo);
+    outState.putParcelable(PlacePageUtils.EXTRA_USER_MARK, mElevationInfo);
   }
 
   @Override
   public void onRestore(@NonNull Bundle inState)
   {
-    mElevationInfo = inState.getParcelable(EXTRA_ELEVATION_INFO);
+    mElevationInfo = inState.getParcelable(PlacePageUtils.EXTRA_USER_MARK);
     if (mElevationInfo != null)
       render(mElevationInfo);
   }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java
index 7424a9134e..cdb84bcd19 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java
@@ -148,10 +148,10 @@ class PlacePageControllerComposite implements PlacePageController
   @Override
   public void onRestore(@NonNull Bundle inState)
   {
-    MapObject object = inState.getParcelable(PlacePageUtils.EXTRA_MAP_OBJECT);
-    if (object != null)
+    UserMarkInterface userMark = inState.getParcelable(PlacePageUtils.EXTRA_USER_MARK);
+    if (userMark != null)
     {
-      PlacePageController controller = findControllerFor(object);
+      PlacePageController controller = findControllerFor(userMark);
       if (controller != null)
         mActiveController = controller;
     }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java
index 8e8b517272..f8c83e6be9 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java
@@ -17,7 +17,7 @@ import com.trafi.anchorbottomsheetbehavior.AnchorBottomSheetBehavior;
 
 class PlacePageUtils
 {
-  static final String EXTRA_MAP_OBJECT = "extra_map_object";
+  static final String EXTRA_USER_MARK = "extra_user_mark";
 
   static void moveViewportUp(@NonNull View placePageView, int viewportMinHeight)
   {
diff --git a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
index 61e9f86ec0..880cb810d3 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
@@ -448,7 +448,7 @@ public class RichPlacePageController implements PlacePageController, LocationLis
   public void onSave(@NonNull Bundle outState)
   {
     mPlacePageTracker.onSave(outState);
-    outState.putParcelable(PlacePageUtils.EXTRA_MAP_OBJECT, mPlacePage.getMapObject());
+    outState.putParcelable(PlacePageUtils.EXTRA_USER_MARK, mPlacePage.getMapObject());
   }
 
   @Override
@@ -464,7 +464,7 @@ public class RichPlacePageController implements PlacePageController, LocationLis
       return;
     }
 
-    MapObject object = inState.getParcelable(PlacePageUtils.EXTRA_MAP_OBJECT);
+    MapObject object = inState.getParcelable(PlacePageUtils.EXTRA_USER_MARK);
     if (object == null)
       return;
 
diff --git a/android/src/com/mapswithme/maps/widget/placepage/UserMarkInterface.java b/android/src/com/mapswithme/maps/widget/placepage/UserMarkInterface.java
index 9210d6931a..db75f4576b 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/UserMarkInterface.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/UserMarkInterface.java
@@ -1,5 +1,7 @@
 package com.mapswithme.maps.widget.placepage;
 
-public interface UserMarkInterface
+import android.os.Parcelable;
+
+public interface UserMarkInterface extends Parcelable
 {
 }