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

[android] Auto-update screen. Reload info on resume

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-04-24 18:39:07 +03:00 • committed by Aleksandr Zatsepin
parent 9e93bce37a
commit d0286c1556
3 changed files with 77 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -448,7 +448,13 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeFindCountry(JNIEnv * env, j
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeIsDownloading(JNIEnv * env, jclass clazz)
{
return GetStorage().IsDownloadInProgress();
return static_cast<jboolean>(GetStorage().IsDownloadInProgress());
}
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeGetCurrentDownloadingCountryId(JNIEnv * env, jclass)
{
return jni::ToJavaString(env, GetStorage().GetCurrentDownloadingCountryId());
}
static void StartBatchingCallbacks()

2
android/src/com/mapswithme/maps/downloader/MapManager.java
View file

@ -392,6 +392,8 @@ public final class MapManager
*/
public static native boolean nativeIsDownloading();
public static native String nativeGetCurrentDownloadingCountryId();
/**
* Enqueues given {@code root} node and its children in downloader.
*/

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

@ -107,16 +107,10 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
mTotalSizeBytes / Constants.MB);
MapManager.nativeCancel(CountryItem.getRootId());
final UpdateInfo info = MapManager.nativeGetUpdateInfo(CountryItem.getRootId());
if (info == null)
{
finish();
return;
}
updateTotalSizes();
mAutoUpdate = false;
mTotalSize = StringUtils.getFileSizeString(info.totalSize);
mTotalSizeBytes = info.totalSize;
mOutdatedMaps = Framework.nativeGetOutdatedCountries();
if (mStorageCallback != null)
@ -262,28 +256,39 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
{
super.onResume();
if (isAllUpdated())
// The storage callback must be non-null at this point.
//noinspection ConstantConditions
mStorageCallback.attach(this);
if (isAllUpdated() || Framework.nativeGetOutdatedCountries().length == 0)
{
finish();
return;
}
// The storage callback must be non-null at this point.
//noinspection ConstantConditions
mStorageCallback.attach(this);
if (mAutoUpdate && !MapManager.nativeIsDownloading())
if (mAutoUpdate)
{
MapManager.warnOn3gUpdate(getActivity(), CountryItem.getRootId(), new Runnable()
if (!MapManager.nativeIsDownloading())
{
@Override
public void run()
MapManager.warnOn3gUpdate(getActivity(), CountryItem.getRootId(), new Runnable()
{
MapManager.nativeUpdate(CountryItem.getRootId());
Statistics.INSTANCE.trackDownloaderDialogEvent(DOWNLOADER_DIALOG_DOWNLOAD,
mTotalSizeBytes / Constants.MB);
}
});
@Override
public void run()
{
MapManager.nativeUpdate(CountryItem.getRootId());
Statistics.INSTANCE.trackDownloaderDialogEvent(DOWNLOADER_DIALOG_DOWNLOAD,
mTotalSizeBytes / Constants.MB);
}
});
}
else
{
updateTotalSizes();
updateProgress();
updateProcessedMapInfo();
setCommonStatus(mProcessedMapId, mCommonStatusResId);
}
}
}
@ -385,6 +390,47 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
String status = getString(mwmStatusResId, MapManager.nativeGetName(mwmId));
mTitle.setText(status);
}
void updateTotalSizes()
{
final UpdateInfo info = MapManager.nativeGetUpdateInfo(CountryItem.getRootId());
if (info == null)
{
finish();
return;
}
mTotalSize = StringUtils.getFileSizeString(info.totalSize);
mTotalSizeBytes = info.totalSize;
}
void updateProgress()
{
int progress = MapManager.nativeGetOverallProgress(mOutdatedMaps);
setProgress(progress, mTotalSizeBytes * progress / 100, mTotalSizeBytes);
}
void updateProcessedMapInfo()
{
mProcessedMapId = MapManager.nativeGetCurrentDownloadingCountryId();
CountryItem processedCountryItem = new CountryItem(mProcessedMapId);
MapManager.nativeGetAttributes(processedCountryItem);
switch (processedCountryItem.status)
{
case CountryItem.STATUS_PROGRESS:
mCommonStatusResId = R.string.downloader_process;
break;
case CountryItem.STATUS_APPLYING:
mCommonStatusResId = R.string.downloader_applying;
break;
default:
mCommonStatusResId = 0;
break;
}
}
private static class DetachableStorageCallback implements MapManager.StorageCallback
{
@Nullable