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

[new downloader][android] fix: Storage callbacks in App class.

Browse source
This commit is contained in:
Alexander Marchuk 2016-02-09 12:06:51 +03:00 • committed by Sergey Yershov
parent ab7e16479a
commit 22f470f23a
1 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
android/src/com/mapswithme/maps/MwmApplication.java
View file

@ -12,12 +12,11 @@ import android.util.Log;
import java.io.File;
import com.google.gson.Gson;
import com.mapswithme.maps.downloader.country.OldActiveCountryTree;
import com.mapswithme.maps.downloader.country.OldCountryItem;
import com.mapswithme.maps.background.AppBackgroundTracker;
import com.mapswithme.maps.background.Notifier;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.downloader.country.OldMapStorage;
import com.mapswithme.maps.downloader.CountryItem;
import com.mapswithme.maps.downloader.MapManager;
import com.mapswithme.maps.editor.Editor;
import com.mapswithme.maps.location.TrackRecorder;
import com.mapswithme.maps.sound.TtsPlayer;
@ -27,14 +26,12 @@ import com.mapswithme.util.ThemeSwitcher;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Yota;
import com.mapswithme.util.statistics.AlohaHelper;
import com.mapswithme.util.statistics.Statistics;
import com.parse.Parse;
import com.parse.ParseException;
import com.parse.ParseInstallation;
import com.parse.SaveCallback;
public class MwmApplication extends Application
implements OldActiveCountryTree.ActiveCountryListener
{
private final static String TAG = "MwmApplication";
@ -53,6 +50,20 @@ public class MwmApplication extends Application
private Handler mMainLoopHandler;
private final Object mMainQueueToken = new Object();
private final MapManager.StorageCallback mStorageCallbacks = new MapManager.StorageCallback()
{
@Override
public void onStatusChanged(String countryId, int newStatus)
{
Notifier.cancelDownloadSuggest();
if (newStatus == CountryItem.STATUS_FAILED)
Notifier.notifyDownloadFailed(countryId);
}
@Override
public void onProgress(String countryId, long localSize, long remoteSize) {}
};
public MwmApplication()
{
super();
@ -79,32 +90,6 @@ public class MwmApplication extends Application
return sSelf.mPrefs;
}
@Override
public void onCountryProgressChanged(int group, int position, long[] sizes) {}
@Override
public void onCountryStatusChanged(int group, int position, int oldStatus, int newStatus)
{
Notifier.cancelDownloadSuggest();
if (newStatus == OldMapStorage.DOWNLOAD_FAILED)
{
OldCountryItem item = OldActiveCountryTree.getCountryItem(group, position);
Notifier.notifyDownloadFailed(OldActiveCountryTree.getCoreIndex(group, position), item.getName());
}
}
@Override
public void onCountryGroupChanged(int oldGroup, int oldPosition, int newGroup, int newPosition)
{
if (oldGroup == OldActiveCountryTree.GROUP_NEW && newGroup == OldActiveCountryTree.GROUP_UP_TO_DATE)
Statistics.INSTANCE.trackMapChanged(Statistics.EventName.MAP_DOWNLOADED);
else if (oldGroup == OldActiveCountryTree.GROUP_OUT_OF_DATE && newGroup == OldActiveCountryTree.GROUP_UP_TO_DATE)
Statistics.INSTANCE.trackMapChanged(Statistics.EventName.MAP_UPDATED);
}
@Override
public void onCountryOptionsChanged(int group, int position, int newOptions, int requestOptions) {}
@Override
public void onCreate()
{
@ -128,7 +113,9 @@ public class MwmApplication extends Application
return;
nativeInitFramework();
//OldActiveCountryTree.addListener(this);
MapManager.nativeSubscribe(mStorageCallbacks);
initNativeStrings();
BookmarkManager.nativeLoadBookmarks();
TtsPlayer.INSTANCE.init(this);