From 22f470f23a3d018dfaf75983db2ba54e2cf8d3cb Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Tue, 9 Feb 2016 12:06:51 +0300
Subject: [PATCH] [new downloader][android] fix: Storage callbacks in App
 class.

---
 .../com/mapswithme/maps/MwmApplication.java   | 51 +++++++------------
 1 file changed, 19 insertions(+), 32 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java
index accc46e2ef..737e11da01 100644
--- a/android/src/com/mapswithme/maps/MwmApplication.java
+++ b/android/src/com/mapswithme/maps/MwmApplication.java
@@ -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);