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

Changed timestamp-methods signature

Browse source
This commit is contained in:
r.kuznetsov 2018-02-14 14:12:16 +03:00 • committed by Roman Kuznetsov
parent 6f49ea9388
commit 6616762990
6 changed files with 12 additions and 9 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

@ -353,9 +353,9 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeIsCloudEnabled(
}
JNIEXPORT jlong JNICALL
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetLastSynchronizationTimestamp(
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetLastSynchronizationTimestampInMs(
JNIEnv * env, jobject thiz)
{
return static_cast<jlong>(frm()->GetBookmarkManager().GetLastSynchronizationTimestamp());
return static_cast<jlong>(frm()->GetBookmarkManager().GetLastSynchronizationTimestampInMs());
}
} // extern "C"

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

@ -213,7 +213,10 @@ public enum BookmarkManager
public boolean isCloudEnabled() { return nativeIsCloudEnabled(); }
public long getLastSynchronizationTimestamp() { return nativeGetLastSynchronizationTimestamp(); }
public long getLastSynchronizationTimestampInMs()
{
return nativeGetLastSynchronizationTimestampInMs();
}
public static void loadKmzFile(@NonNull String path, boolean isTemporaryFile)
{
@ -284,7 +287,7 @@ public enum BookmarkManager
private native boolean nativeIsCloudEnabled();
private native long nativeGetLastSynchronizationTimestamp();
private native long nativeGetLastSynchronizationTimestampInMs();
private static native String nativeGenerateUniqueFileName(String baseName);

4
map/bookmark_manager.cpp
View file

@ -1185,9 +1185,9 @@ bool BookmarkManager::IsCloudEnabled() const
return m_bookmarkCloud.GetState() == Cloud::State::Enabled;
}
uint64_t BookmarkManager::GetLastSynchronizationTimestamp() const
uint64_t BookmarkManager::GetLastSynchronizationTimestampInMs() const
{
return m_bookmarkCloud.GetLastSynchronizationTimestamp();
return m_bookmarkCloud.GetLastSynchronizationTimestampInMs();
}
std::unique_ptr<User::Subscriber> BookmarkManager::GetUserSubscriber()

2
map/bookmark_manager.hpp
View file

@ -187,7 +187,7 @@ public:
void SetCloudEnabled(bool enabled);
bool IsCloudEnabled() const;
uint64_t GetLastSynchronizationTimestamp() const;
uint64_t GetLastSynchronizationTimestampInMs() const;
std::unique_ptr<User::Subscriber> GetUserSubscriber();
void SetInvalidTokenHandler(Cloud::InvalidTokenHandler && onInvalidToken);

2
map/cloud.cpp
View file

@ -154,7 +154,7 @@ void Cloud::MarkModified(std::string const & filePath)
MarkModifiedImpl(filePath, false /* checkSize */);
}
uint64_t Cloud::GetLastSynchronizationTimestamp() const
uint64_t Cloud::GetLastSynchronizationTimestampInMs() const
{
std::lock_guard<std::mutex> lock(m_mutex);
if (m_state != State::Enabled)

2
map/cloud.hpp
View file

@ -166,7 +166,7 @@ public:
void SetState(State state);
State GetState() const;
// Return timestamp of the last synchronization in milliseconds.
uint64_t GetLastSynchronizationTimestamp() const;
uint64_t GetLastSynchronizationTimestampInMs() const;
void Init(std::vector<std::string> const & filePaths);
void MarkModified(std::string const & filePath);