From 289f61f4dbff89eeb6fbbe3e5a01257fc808f032 Mon Sep 17 00:00:00 2001 From: Andrei Shkrob Date: Wed, 28 May 2025 21:18:25 +0200 Subject: [PATCH 1/2] tmp --- .../bookmarks/data/BookmarkManager.cpp | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp b/android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp index f801f37b51b..5392dbc346f 100644 --- a/android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp @@ -50,25 +50,20 @@ void PrepareClassRefs(JNIEnv * env) if (g_bookmarkManagerClass) return; - g_bookmarkManagerClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkManager"); - g_bookmarkManagerInstanceField = jni::GetStaticFieldID(env, g_bookmarkManagerClass, "INSTANCE", - "Lapp/organicmaps/bookmarks/data/BookmarkManager;"); + g_bookmarkManagerClass = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkManager"); + g_bookmarkManagerInstanceField = + jni::GetStaticFieldID(env, g_bookmarkManagerClass, "INSTANCE", "Lapp/organicmaps/bookmarks/data/BookmarkManager;"); - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - g_onBookmarksChangedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksChanged", "()V"); + jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField); + g_onBookmarksChangedMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksChanged", "()V"); g_onBookmarksLoadingStartedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingStarted", "()V"); + jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingStarted", "()V"); g_onBookmarksLoadingFinishedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingFinished", "()V"); + jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingFinished", "()V"); g_onBookmarksFileLoadedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksFileLoaded", - "(ZLjava/lang/String;Z)V"); - g_onPreparedFileForSharingMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onPreparedFileForSharing", - "(Lapp/organicmaps/bookmarks/data/BookmarkSharingResult;)V"); + jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksFileLoaded", "(ZLjava/lang/String;Z)V"); + g_onPreparedFileForSharingMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onPreparedFileForSharing", + "(Lapp/organicmaps/bookmarks/data/BookmarkSharingResult;)V"); g_longClass = jni::GetGlobalClassRef(env,"java/lang/Long"); g_longConstructor = jni::GetConstructorID(env, g_longClass, "(J)V"); From 0b992e2f03724d619a8b56c6680079a593bd821c Mon Sep 17 00:00:00 2001 From: Andrei Shkrob Date: Wed, 28 May 2025 21:25:19 +0200 Subject: [PATCH 2/2] tmp2 --- map/everywhere_search_callback.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/map/everywhere_search_callback.cpp b/map/everywhere_search_callback.cpp index ffffb4ff13a..170e8c0eafd 100644 --- a/map/everywhere_search_callback.cpp +++ b/map/everywhere_search_callback.cpp @@ -15,10 +15,12 @@ void EverywhereSearchCallback::operator()(Results const & results) size_t const currSize = results.GetCount(); ASSERT_LESS_OR_EQUAL(prevSize, currSize, ()); + const size_t & tmp = prevSize; + // Comment for (size_t i = prevSize; i < currSize; ++i) - m_productInfo.push_back(m_delegate.GetProductInfo(results[i])); + m_productInfo.push_back(m_delegate.GetProductInfo(results[i])); - m_delegate.RunUITask([onResults = m_onResults, results, productInfo = m_productInfo]() mutable + m_delegate.RunUITask([onResults = m_onResults, results, productInfo = m_productInfo]() mutable { onResults(std::move(results), std::move(productInfo)); });