From c76bddaac3dd517bf628cfd5a16e58f5c8159554 Mon Sep 17 00:00:00 2001
From: Alexander Zatsepin <az@mapswithme.com>
Date: Thu, 16 Aug 2018 15:21:29 +0300
Subject: [PATCH] [android] Fixed mapobject serialization

---
 android/src/com/mapswithme/maps/bookmarks/data/MapObject.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
index 3f9799e3d2..ad6be2c887 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
@@ -449,10 +449,12 @@ public class MapObject implements Parcelable, PopularityProvider
     dest.writeInt(mCanBeReviewed ? 1 : 0);
     dest.writeParcelable(mHotelType, 0);
     dest.writeInt(mPriceRate);
+    dest.writeParcelable(mPopularity, 0);
+    // All collections are deserialized AFTER non-collection and primitive type objects,
+    // so collections must be always serialized at the end.
     dest.writeTypedList(mBanners);
     dest.writeList(mReachableByTaxiTypes);
     dest.writeTypedList(mRatings);
-    dest.writeParcelable(mPopularity, 0);
   }
 
   @Override