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

[android] Removed trick with countries sizes caching - it's not needed because of changed logic in the UI

Browse source
This commit is contained in:
Alex Zolotarev 2011-12-19 19:59:10 +03:00 • committed by Alex Zolotarev
parent d136af0b5f
commit 5e9235f172
2 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/jni/com/mapswithme/maps/DownloadUI.cpp
View file

@ -74,32 +74,18 @@ extern "C"
return env->NewStringUTF(name.c_str());
}
// @TODO Small hack to save time by caching last file size
storage::TIndex g_lastCountryIndex(storage::TIndex::INVALID);
storage::LocalAndRemoteSizeT g_lastSize(-1, -1);
JNIEXPORT jlong JNICALL
Java_com_mapswithme_maps_DownloadUI_countryLocalSizeInBytes(JNIEnv * env, jobject thiz,
jint group, jint country, jint region)
{
storage::TIndex const index(group, country, region);
if (index == g_lastCountryIndex)
return g_lastSize.first;
g_lastCountryIndex = index;
g_lastSize = g_framework->Storage().CountrySizeInBytes(index);
return g_lastSize.first;
return g_framework->Storage().CountrySizeInBytes(storage::TIndex(group, country, region)).first;
}
JNIEXPORT jlong JNICALL
Java_com_mapswithme_maps_DownloadUI_countryRemoteSizeInBytes(JNIEnv * env, jobject thiz,
jint group, jint country, jint region)
{
storage::TIndex const index(group, country, region);
if (index == g_lastCountryIndex)
return g_lastSize.second;
g_lastCountryIndex = index;
g_lastSize = g_framework->Storage().CountrySizeInBytes(index);
return g_lastSize.second;
return g_framework->Storage().CountrySizeInBytes(storage::TIndex(group, country, region)).first;
}
JNIEXPORT jint JNICALL

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

@ -1,14 +1,3 @@
/*
* MWMActivity.cpp
*
* Created on: Oct 13, 2011
* Author: siarheirachytski
*/
///////////////////////////////////////////////////////////////////////////////////
// MWMActivity
///////////////////////////////////////////////////////////////////////////////////
#include <jni.h>
#include "../core/logging.hpp"