diff options
| author | Александр Зацепин <az@mapswithme.com> | 2019-12-23 17:25:09 +0300 |
|---|---|---|
| committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2019-12-23 18:22:37 +0300 |
| commit | 38e532067881a3c00a618dfc203cdac0989c9031 (patch) | |
| tree | 4f8d5a76d67bcb3a3490c6d76dd118794f4ee2cd /android/jni/com/mapswithme/maps/MapManager.cpp | |
| parent | 766818f2a464629501ce7b7a6800b56efa382743 (diff) | |
[android] Fixed crash during access to C++ framework place page object while it's not intitialized. It may happen when the app was killed/dumped by OS when PP is opened (launched by incoming intent or deeplin) and then core doesn't have place page info and synchronization between platform and C++ framework is broken. So, we don't restore place page info from java map object and it's by design for a while.android-951
Diffstat (limited to 'android/jni/com/mapswithme/maps/MapManager.cpp')
| -rw-r--r-- | android/jni/com/mapswithme/maps/MapManager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/android/jni/com/mapswithme/maps/MapManager.cpp b/android/jni/com/mapswithme/maps/MapManager.cpp index 5bb351f88e..330cbbb04a 100644 --- a/android/jni/com/mapswithme/maps/MapManager.cpp +++ b/android/jni/com/mapswithme/maps/MapManager.cpp @@ -569,6 +569,9 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeEnableDownloadOn3g(JNIEnv * JNIEXPORT jstring JNICALL Java_com_mapswithme_maps_downloader_MapManager_nativeGetSelectedCountry(JNIEnv * env, jclass clazz) { + if (!g_framework->NativeFramework()->HasPlacePageInfo()) + return nullptr; + storage::CountryId const & res = g_framework->GetPlacePageInfo().GetCountryId(); return (res == storage::kInvalidCountryId ? nullptr : jni::ToJavaString(env, res)); } |