From 98b31651d1077976ed6cddb7444a9524aa7b1b33 Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Mon, 24 Jun 2019 18:54:32 +0300
Subject: [PATCH] Review fixes

---
 .../mapswithme/maps/bookmarks/data/BookmarkManager.cpp    | 4 ++--
 .../mapswithme/maps/bookmarks/data/BookmarkManager.java   | 6 +++---
 map/bookmark_catalog.cpp                                  | 8 ++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
index bd42c2509c..a72448938c 100644
--- a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
+++ b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
@@ -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);
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
index a96b85a8b0..4d5721d956 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
@@ -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
diff --git a/map/bookmark_catalog.cpp b/map/bookmark_catalog.cpp
index f842a8d4b7..24d1a4d798 100644
--- a/map/bookmark_catalog.cpp
+++ b/map/bookmark_catalog.cpp
@@ -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 */);