Merge pull request #3387 from mgsergio/get-user-stats-from-server

[editor] Get user stats from server

2 files changed, 18 insertions, 17 deletions

diff --git a/map/framework.cpp b/map/framework.cpp
index c5253230b3..2fd2cacd9a 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -412,6 +412,8 @@ Framework::Framework()
   editor.LoadMapEdits();
 
   m_model.GetIndex().AddObserver(editor);
+
+  LOG(LINFO, ("Editor initialized"));
 }
 
 Framework::~Framework()
@@ -2900,12 +2902,3 @@ bool Framework::RollBackChanges(FeatureID const & fid)
   }
   return rolledBack;
 }
-
-bool Framework::UpdateUserStats(string const & userName)
-{
-  auto userStats = make_unique<editor::UserStats>(userName);
-  if (!userStats->GetUpdateStatus())
-    return false;
-  m_userStats = move(userStats);
-  return true;
-}
diff --git a/map/framework.hpp b/map/framework.hpp
index 1fd41a1d7f..1e8a4c2dea 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -43,7 +43,6 @@
 #include "base/thread_checker.hpp"
 
 #include "std/list.hpp"
-#include "std/shared_ptr.hpp"
 #include "std/target_os.hpp"
 #include "std/unique_ptr.hpp"
 #include "std/vector.hpp"
@@ -675,15 +674,24 @@ private:
 
 public:
   //@{
-  //User statistics.
-  editor::UserStats const * GetUserStats() const { return m_userStats.get(); }
-  /// Sends a synchronous request to the server and updates user's stats.
-  /// @returns true on success.
-  bool UpdateUserStats(string const & userName);
-  void DropUserStats() { m_userStats = nullptr; }
+  // User statistics.
+
+  editor::UserStats GetUserStats(string const & userName) const
+  {
+    return m_userStatsLoader.GetStats(userName);
+  }
+
+  // Reads user stats from server or gets it from cache calls |fn| on success.
+  void UpdateUserStats(string const & userName,
+                       editor::UserStatsLoader::TOnUpdateCallback fn)
+  {
+    m_userStatsLoader.Update(userName, fn);
+  }
+
+  void DropUserStats(string const & userName) { m_userStatsLoader.DropStats(userName); }
 
 private:
-  unique_ptr<editor::UserStats> m_userStats;
+  editor::UserStatsLoader m_userStatsLoader;
   //@}
 
   DECLARE_THREAD_CHECKER(m_threadChecker);