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

[android] add: Actual implementation of "Migrate" button.

Browse source
This commit is contained in:
Alexander Marchuk 2016-01-22 21:36:07 +03:00 • committed by Sergey Yershov
parent 9623308839
commit fe873597a4
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/jni/com/mapswithme/country/ActiveCountryTree.cpp
View file

@ -146,19 +146,15 @@ extern "C"
GetMapLayout().DownloadMap(storage::ToNative(index), ToOptions(options));
}
// FIXME (trashkalmar): Include proper logic
static bool legacy_mode = true;
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_country_ActiveCountryTree_isLegacyMode(JNIEnv * env, jclass clazz)
{
return legacy_mode;
return g_framework->NeedMigrate();
}
JNIEXPORT void JNICALL
Java_com_mapswithme_country_ActiveCountryTree_migrate(JNIEnv * env, jclass clazz)
{
legacy_mode = false;
g_framework->Migrate();
}
}

11
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -542,11 +542,20 @@ void Framework::SetActiveUserMark(UserMark const * mark)
m_activeUserMark = mark;
}
bool Framework::NeedMigrate()
{
return platform::migrate::NeedMigrate();
}
void Framework::Migrate()
{
m_work.Migrate();
}
UserMark const * Framework::GetActiveUserMark()
{
return m_activeUserMark;
}
} // namespace android
//============ GLUE CODE for com.mapswithme.maps.Framework class =============//

3
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -169,6 +169,9 @@ namespace android
void SetActiveUserMark(UserMark const * mark);
UserMark const * GetActiveUserMark();
bool NeedMigrate();
void Migrate();
public:
virtual void ItemStatusChanged(int childPosition);
virtual void ItemProgressChanged(int childPosition, storage::LocalAndRemoteSizeT const & sizes);