mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[bookmarks][android] Bookmarks changed callback.

Browse source
This commit is contained in:
Daria Volvenkova 2019-10-01 16:05:00 +03:00 • committed by Roman Kuznetsov
parent 77c96f63a7
commit cac3f2051a
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
View file

@ -24,6 +24,7 @@ namespace
jclass g_bookmarkManagerClass;
jfieldID g_bookmarkManagerInstanceField;
jmethodID g_onBookmarksChangedMethod;
jmethodID g_onBookmarksLoadingStartedMethod;
jmethodID g_onBookmarksLoadingFinishedMethod;
jmethodID g_onBookmarksFileLoadedMethod;
@ -74,6 +75,8 @@ void PrepareClassRefs(JNIEnv * env)
jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
g_bookmarkManagerInstanceField);
g_onBookmarksChangedMethod =
jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksChanged", "()V");
g_onBookmarksLoadingStartedMethod =
jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingStarted", "()V");
g_onBookmarksLoadingFinishedMethod =
@ -177,6 +180,15 @@ void PrepareClassRefs(JNIEnv * env)
"[Lcom/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption;)V");
}
void OnBookmarksChanged(JNIEnv * env)
{
ASSERT(g_bookmarkManagerClass, ());
jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
g_bookmarkManagerInstanceField);
env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksChangedMethod);
jni::HandleJavaException(env);
}
void OnAsyncLoadingStarted(JNIEnv * env)
{
ASSERT(g_bookmarkManagerClass, ());
@ -530,6 +542,9 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIE
std::bind(&OnImportFinished, env, _1, _2, _3),
std::bind(&OnUploadStarted, env, _1),
std::bind(&OnUploadFinished, env, _1, _2, _3, _4));
frm()->GetBookmarkManager().SetBookmarksChangedCallback(std::bind(&OnBookmarksChanged, env));
frm()->LoadBookmarks();
}

7
android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
View file

@ -191,6 +191,13 @@ public enum BookmarkManager
}
// Called from JNI.
@SuppressWarnings("unused")
@MainThread
public void onBookmarksChanged()
{
// TODO: Implement.
}
@SuppressWarnings("unused")
@MainThread
public void onBookmarksLoadingStarted()