From cfd1d3cad5fe70f8c6ce61822280c8e5f02859e4 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?= Date: Tue, 18 Jul 2017 16:04:18 +0300 Subject: [PATCH] [android] Fixed getting displayed categories JNI method --- .../jni/com/mapswithme/maps/DisplayedCategories.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/android/jni/com/mapswithme/maps/DisplayedCategories.cpp b/android/jni/com/mapswithme/maps/DisplayedCategories.cpp index bdddf6e29f..56d88ef84a 100644 --- a/android/jni/com/mapswithme/maps/DisplayedCategories.cpp +++ b/android/jni/com/mapswithme/maps/DisplayedCategories.cpp @@ -1,12 +1,16 @@ -#include "search/displayed_categories.hpp" +#include "com/mapswithme/maps/Framework.hpp" +#include "com/mapswithme/core/jni_helper.hpp" -#include "../core/jni_helper.hpp" +#include "search/displayed_categories.hpp" extern "C" { JNIEXPORT jobjectArray JNICALL Java_com_mapswithme_maps_search_DisplayedCategories_nativeGetKeys(JNIEnv * env, jclass clazz) { - return jni::ToJavaStringArray(env, search::DisplayedCategories::GetKeys()); + ::Framework * fr = g_framework->NativeFramework(); + ASSERT(fr, ()); + search::DisplayedCategories categories = fr->GetDisplayedCategories(); + return jni::ToJavaStringArray(env, categories.GetKeys()); } } // extern "C"