From 4dffa878d85be17b4afe82a1de5160d0439ac234 Mon Sep 17 00:00:00 2001 From: Dmitry Kunin Date: Tue, 17 Dec 2013 16:26:25 +0300 Subject: [PATCH] [AND] Fixed multiple notifications. --- android/jni/com/mapswithme/maps/Framework.cpp | 2 +- map/framework.cpp | 10 +++++----- map/framework.hpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index b50e75ae47..4648cc9ea0 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -776,7 +776,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_Framework_nativeIsDataVersionChanged(JNIEnv * env, jclass clazz) { - return g_framework->NativeFramework()->IsDataVersionChanged() ? JNI_TRUE : JNI_FALSE; + return g_framework->NativeFramework()->IsDataVersionUpdated() ? JNI_TRUE : JNI_FALSE; } JNIEXPORT void JNICALL diff --git a/map/framework.cpp b/map/framework.cpp index 852c470703..6c747bb4f7 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1,4 +1,4 @@ -#include "framework.hpp" +#include "framework.hpp" #include "feature_processor.hpp" #include "drawer.hpp" #include "benchmark_provider.hpp" @@ -1712,12 +1712,12 @@ string Framework::GenerateApiBackUrl(url_scheme::ApiPoint const & point) return res; } -bool Framework::IsDataVersionChanged() +bool Framework::IsDataVersionUpdated() { - int64_t version; - if (Settings::Get("DataVersion", version)) + int64_t storedVersion; + if (Settings::Get("DataVersion", storedVersion)) { - return version != m_storage.GetCurrentDataVersion(); + return storedVersion < m_storage.GetCurrentDataVersion(); } // no key in the settings, assume new version return true; diff --git a/map/framework.hpp b/map/framework.hpp index ddf9c3f9dd..43a5e81da7 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -483,7 +483,7 @@ public: /// @name Map updates //@{ - bool IsDataVersionChanged(); + bool IsDataVersionUpdated(); void UpdateSavedDataVersion(); //@}