From 17e4bbcb54bbe3e86956076a634b817a3c5b843f 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: Fri, 6 Sep 2019 14:37:59 +0300
Subject: [PATCH] [android] Added description field to promo city gallery item
 object

---
 android/jni/com/mapswithme/maps/promo/Promo.cpp   |  8 +++++---
 .../mapswithme/maps/promo/PromoCityGallery.java   | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/promo/Promo.cpp b/android/jni/com/mapswithme/maps/promo/Promo.cpp
index 4a7a8112bc..b02a97b9c9 100644
--- a/android/jni/com/mapswithme/maps/promo/Promo.cpp
+++ b/android/jni/com/mapswithme/maps/promo/Promo.cpp
@@ -42,7 +42,7 @@ void PrepareClassRefs(JNIEnv * env)
   g_itemConstructor =
       jni::GetConstructorID(env, g_itemClass,
                             "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
-                            "Ljava/lang/String;Ljava/lang/String;"
+                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
                             "Lcom/mapswithme/maps/promo/PromoCityGallery$Author;"
                             "Lcom/mapswithme/maps/promo/PromoCityGallery$LuxCategory;)V");
   g_authorClass =
@@ -103,6 +103,7 @@ jobject MakeCityGallery(JNIEnv * env, promo::CityGallery const & gallery)
   {
     jni::TScopedLocalRef name(env, jni::ToJavaString(env, item.m_name));
     jni::TScopedLocalRef url(env, jni::ToJavaString(env, item.m_url));
+    jni::TScopedLocalRef description(env, jni::ToJavaString(env, item.m_description));
     jni::TScopedLocalRef imageUrl(env, jni::ToJavaString(env, item.m_imageUrl));
     jni::TScopedLocalRef access(env, jni::ToJavaString(env, item.m_access));
     jni::TScopedLocalRef tier(env, jni::ToJavaString(env, item.m_tier));
@@ -117,8 +118,9 @@ jobject MakeCityGallery(JNIEnv * env, promo::CityGallery const & gallery)
         env, env->NewObject(g_categoryClass, g_categoryConstructor, luxCategoryName.get(),
                             luxCategoryColor.get()));
 
-    return env->NewObject(g_itemClass, g_itemConstructor, name.get(), url.get(), imageUrl.get(),
-                          access.get(), tier.get(), author.get(), luxCategory.get());
+      return env->NewObject(g_itemClass, g_itemConstructor, name.get(), url.get(),
+                            description.get(), imageUrl.get(), access.get(), tier.get(),
+                            author.get(), luxCategory.get());
   };
 
   jni::TScopedLocalObjectArrayRef items(env, jni::ToJavaArray(env, g_itemClass, gallery.m_items,
diff --git a/android/src/com/mapswithme/maps/promo/PromoCityGallery.java b/android/src/com/mapswithme/maps/promo/PromoCityGallery.java
index 518d3282d2..0ce76b218f 100644
--- a/android/src/com/mapswithme/maps/promo/PromoCityGallery.java
+++ b/android/src/com/mapswithme/maps/promo/PromoCityGallery.java
@@ -37,6 +37,8 @@ public final class PromoCityGallery
     @NonNull
     private final String mUrl;
     @NonNull
+    private final String mDescription;
+    @NonNull
     private final String mImageUrl;
     @NonNull
     private final String mAccess;
@@ -47,12 +49,13 @@ public final class PromoCityGallery
     @Nullable
     private final LuxCategory mLuxCategory;
 
-    public Item(@NonNull String name, @NonNull String url, @NonNull String imageUrl,
-                @NonNull String access, @NonNull String tier, @NonNull Author author,
-                @Nullable LuxCategory luxCategory)
+    public Item(@NonNull String name, @NonNull String url, @NonNull String description,
+                @NonNull String imageUrl, @NonNull String access, @NonNull String tier,
+                @NonNull Author author, @Nullable LuxCategory luxCategory)
     {
       mName = name;
       mUrl = url;
+      mDescription = description;
       mImageUrl = imageUrl;
       mAccess = access;
       mTier = tier;
@@ -72,6 +75,12 @@ public final class PromoCityGallery
       return mUrl;
     }
 
+    @NonNull
+    public String getDescription()
+    {
+      return mDescription;
+    }
+
     @NonNull
     public String getImageUrl()
     {