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

[android] autoupdate total size fix

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-03-05 13:45:30 +03:00 • committed by Vlad Mihaylenko
parent b2fb739abf
commit c99b16a07b
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/maps/MapManager.cpp
View file

@ -278,6 +278,8 @@ static void UpdateItem(JNIEnv * env, jobject item, NodeAttrs const & attrs)
static jfieldID const countryItemFieldTotalChildCount = env->GetFieldID(g_countryItemClass, "totalChildCount", "I");
static jfieldID const countryItemFieldPresent = env->GetFieldID(g_countryItemClass, "present", "Z");
static jfieldID const countryItemFieldProgress = env->GetFieldID(g_countryItemClass, "progress", "I");
static jfieldID const countryItemFieldDownloadedBytes = env->GetFieldID(g_countryItemClass, "downloadedBytes", "J");
static jfieldID const countryItemFieldBytesToDownload = env->GetFieldID(g_countryItemClass, "bytesToDownload", "J");
// Localized name
jni::TScopedLocalRef const name(env, jni::ToJavaString(env, attrs.m_nodeLocalName));
@ -337,10 +339,12 @@ static void UpdateItem(JNIEnv * env, jobject item, NodeAttrs const & attrs)
// Progress
int progress = 0;
if (attrs.m_downloadingProgress.second)
if (attrs.m_downloadingProgress.second != 0)
progress = (int)(attrs.m_downloadingProgress.first * kMaxProgress / attrs.m_downloadingProgress.second);
env->SetIntField(item, countryItemFieldProgress, progress);
env->SetLongField(item, countryItemFieldDownloadedBytes, attrs.m_downloadingProgress.first);
env->SetLongField(item, countryItemFieldBytesToDownload, attrs.m_downloadingProgress.second);
}
static void PutItemsToList(JNIEnv * env, jobject const list, TCountriesVec const & children, int category,

4
android/src/com/mapswithme/maps/downloader/CountryItem.java
View file

@ -55,8 +55,10 @@ public final class CountryItem implements Comparable<CountryItem>
public int errorCode;
public boolean present;
// Percent
// Progress
public int progress;
public long downloadedBytes;
public long bytesToDownload;
// Internal ID for grouping under headers in the list
int headerId;

7
android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
View file

@ -480,8 +480,11 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
return;
int progress = MapManager.nativeGetOverallProgress(mOutdatedMaps);
mFragment.setProgress(progress, localSizeBytes / Constants.MB,
remoteSizeBytes / Constants.MB);
CountryItem root = new CountryItem(CountryItem.getRootId());
MapManager.nativeGetAttributes(root);
mFragment.setProgress(progress, root.downloadedBytes / Constants.MB,
root.bytesToDownload / Constants.MB);
}
void attach(@NonNull UpdaterDialogFragment fragment)