From bc4c535f73d788ab57e1fd38761d8068c1e3beb2 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Fri, 11 Nov 2011 13:51:13 +0300
Subject: [PATCH] [android] Removed unused code, fixed compile error

---
 android/jni/Android.mk                        |  6 ++--
 .../com/mapswithme/core/download_manager.cpp  | 28 -------------------
 .../com/mapswithme/core/download_manager.hpp  | 23 ---------------
 android/jni/com/mapswithme/maps/Framework.cpp |  2 +-
 .../{maps => platform}/Platform.cpp           |  1 -
 .../{maps => platform}/Platform.hpp           |  2 --
 6 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 android/jni/com/mapswithme/core/download_manager.cpp
 delete mode 100644 android/jni/com/mapswithme/core/download_manager.hpp
 rename android/jni/com/mapswithme/{maps => platform}/Platform.cpp (99%)
 rename android/jni/com/mapswithme/{maps => platform}/Platform.hpp (99%)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 6c1b88e602..231e518d3c 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -14,14 +14,12 @@ LOCAL_HEADER_FILES := \
  	com/mapswithme/core/jni_helper.hpp \
 	com/mapswithme/core/jni_string.hpp \
 	com/mapswithme/core/logging.hpp \
-	com/mapswithme/core/download_manager.hpp \
 	com/mapswithme/core/render_context.hpp \
 	com/mapswithme/maps/Framework.hpp \
-	com/mapswithme/maps/Platform.hpp \
+	com/mapswithme/platform/Platform.hpp \
 
 LOCAL_SRC_FILES := \
 	com/mapswithme/core/concurrent_runner.cpp \
-	com/mapswithme/core/download_manager.cpp \
 	com/mapswithme/core/jni_helper.cpp \
 	com/mapswithme/core/jni_string.cpp \
 	com/mapswithme/core/logging.cpp \
@@ -32,8 +30,8 @@ LOCAL_SRC_FILES := \
 	com/mapswithme/maps/VideoTimer.cpp \
 	com/mapswithme/maps/GesturesProcessor.cpp \
 	com/mapswithme/maps/MainGLView.cpp \
-	com/mapswithme/maps/Platform.cpp \
 	com/mapswithme/maps/MWMActivity.cpp \
+	com/mapswithme/platform/Platform.cpp \
 	
 LOCAL_LDLIBS := -llog -lGLESv1_CM \
   	-lwords -lmap -lversion -lsearch -lstorage -lindexer -lyg -lplatform \
diff --git a/android/jni/com/mapswithme/core/download_manager.cpp b/android/jni/com/mapswithme/core/download_manager.cpp
deleted file mode 100644
index 737775f921..0000000000
--- a/android/jni/com/mapswithme/core/download_manager.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * download_manager.cpp
- *
- *  Created on: Oct 14, 2011
- *      Author: siarheirachytski
- */
-
-#include "download_manager.hpp"
-
-namespace android
-{
-  void DownloadManager::HttpRequest(HttpStartParams const & params)
-  {}
-
-  void DownloadManager::CancelDownload(string const & url)
-  {}
-
-  void DownloadManager::CancelAllDownloads()
-  {}
-
-}
-
-DownloadManager & GetDownloadManager()
-{
-  static android::DownloadManager manager;
-  return manager;
-}
-
diff --git a/android/jni/com/mapswithme/core/download_manager.hpp b/android/jni/com/mapswithme/core/download_manager.hpp
deleted file mode 100644
index 4ab44902e2..0000000000
--- a/android/jni/com/mapswithme/core/download_manager.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * download_manager.hpp
- *
- *  Created on: Oct 14, 2011
- *      Author: siarheirachytski
- */
-#pragma once
-
-#include "../../../../../platform/download_manager.hpp"
-
-namespace android
-{
-  class DownloadManager : public ::DownloadManager
-  {
-  public:
-
-    virtual void HttpRequest(HttpStartParams const & params);
-    virtual void CancelDownload(string const & url);
-    virtual void CancelAllDownloads();
-  };
-}
-
-DownloadManager & GetDownloadManager();
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 478f89b197..be24f74118 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -49,7 +49,7 @@ namespace android
     g_framework = this;
 
    // @TODO refactor storage
-    m_storage.ReInitCountries(false);
+    m_work.Storage().ReInitCountries(false);
   }
 
   void Framework::SetParentView(jobject view)
diff --git a/android/jni/com/mapswithme/maps/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp
similarity index 99%
rename from android/jni/com/mapswithme/maps/Platform.cpp
rename to android/jni/com/mapswithme/platform/Platform.cpp
index bc9f75665a..4b79a3e622 100644
--- a/android/jni/com/mapswithme/maps/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@@ -25,4 +25,3 @@ Platform & GetPlatform()
 {
   return android::Platform::Instance();
 }
-
diff --git a/android/jni/com/mapswithme/maps/Platform.hpp b/android/jni/com/mapswithme/platform/Platform.hpp
similarity index 99%
rename from android/jni/com/mapswithme/maps/Platform.hpp
rename to android/jni/com/mapswithme/platform/Platform.hpp
index 2987666bda..9184ebf44a 100644
--- a/android/jni/com/mapswithme/maps/Platform.hpp
+++ b/android/jni/com/mapswithme/platform/Platform.hpp
@@ -14,5 +14,3 @@ namespace android
     static Platform & Instance();
   };
 }
-
-