Skip to content

tmp #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrewShkrob wants to merge 2 commits into
base: master
Choose a base branch
from
Open

tmp #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
289f61f
tmp
AndrewShkrob May 28, 2025
0b992e2
tmp2
AndrewShkrob May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

@github-actions github-actions Bot May 28, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[clang-format] reported by reviewdog 🐶

Suggested change
g_onBookmarksChangedMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksChanged", "()V");
g_onBookmarksChangedMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksChanged", "()V");

g_onBookmarksLoadingStartedMethod =
jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingStarted", "()V");
jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingStarted", "()V");

@github-actions github-actions Bot May 28, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[clang-format] reported by reviewdog 🐶

Suggested change
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");

@github-actions github-actions Bot May 28, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[clang-format] reported by reviewdog 🐶

Suggested change
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");

@github-actions github-actions Bot May 28, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[clang-format] reported by reviewdog 🐶

Suggested change
jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksFileLoaded", "(ZLjava/lang/String;Z)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");
Expand Down
6 changes: 4 additions & 2 deletions map/everywhere_search_callback.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +18 to +19

@github-actions github-actions Bot May 28, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[clang-format] reported by reviewdog 🐶

Suggested change
const size_t & tmp = prevSize;
// Comment
size_t const & 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]));

@github-actions github-actions Bot May 28, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[clang-format] reported by reviewdog 🐶

Suggested change
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));
});
Comment on lines +23 to 26

@github-actions github-actions Bot May 28, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[clang-format] reported by reviewdog 🐶

Suggested change
m_delegate.RunUITask([onResults = m_onResults, results, productInfo = m_productInfo]() mutable
{
onResults(std::move(results), std::move(productInfo));
});
m_delegate.RunUITask([onResults = m_onResults, results, productInfo = m_productInfo]() mutable
{ onResults(std::move(results), std::move(productInfo)); });

Expand Down
Loading