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

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2019-06-24 18:54:32 +03:00 • committed by Arsentiy Milchakov
parent 7466969a82
commit 98b31651d1
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -359,8 +359,8 @@ void OnPingFinished(JNIEnv * env, bool isSuccessful)
{
ASSERT(g_bookmarkManagerClass, ());
jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
g_bookmarkManagerInstanceField);
auto bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
g_bookmarkManagerInstanceField);
env->CallVoidMethod(bookmarkManagerInstance, g_onPingFinishedMethod,
static_cast<jboolean>(isSuccessful));
jni::HandleJavaException(env);

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

@ -320,10 +320,10 @@ public enum BookmarkManager
// Called from JNI.
@SuppressWarnings("unused")
@MainThread
public void onPingFinished(boolean serviceIsAvailable)
public void onPingFinished(boolean isServiceAvailable)
{
for (BookmarksCatalogPingListener listener : mCatalogPingListeners)
listener.onPingFinished(serviceIsAvailable);
listener.onPingFinished(isServiceAvailable);
}
public boolean isVisible(long catId)
@ -861,7 +861,7 @@ public enum BookmarkManager
public interface BookmarksCatalogPingListener
{
void onPingFinished(boolean serviceIsAvailable);
void onPingFinished(boolean isServiceAvailable);
}
public interface BookmarksCatalogListener

8
map/bookmark_catalog.cpp
View file

@ -616,10 +616,14 @@ void BookmarkCatalog::Ping(PingCallback && callback) const
request.SetTimeout(kPingTimeoutInSec);
if (request.RunHttpRequest())
{
static std::string const kExpectedResponse = "pong";
auto constexpr kExpectedResponse = "pong";
auto const resultCode = request.ErrorCode();
if (callback && resultCode >= 200 && resultCode < 300 && request.ServerResponse() == kExpectedResponse)
if (callback && resultCode >= 200 && resultCode < 300 &&
request.ServerResponse() == kExpectedResponse)
{
callback(true /* isSuccessful */);
return;
}
}
if (callback)
callback(false /* isSuccessful */);