From ead3240223d76f7a497001f904c4117d4d6d1956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Mon, 29 Apr 2019 19:07:48 +0300
Subject: [PATCH] [android] Fixed search engine intialization, i.e. made it
 same as for other singletons

---
 .../com/mapswithme/maps/MwmApplication.java   |  2 ++
 .../mapswithme/maps/search/SearchEngine.java  | 21 +++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java
index d8066f9b1f..473eaf4abf 100644
--- a/android/src/com/mapswithme/maps/MwmApplication.java
+++ b/android/src/com/mapswithme/maps/MwmApplication.java
@@ -28,6 +28,7 @@ import com.mapswithme.maps.maplayer.traffic.TrafficManager;
 import com.mapswithme.maps.routing.RoutingController;
 import com.mapswithme.maps.scheduling.ConnectivityJobScheduler;
 import com.mapswithme.maps.scheduling.ConnectivityListener;
+import com.mapswithme.maps.search.SearchEngine;
 import com.mapswithme.maps.sound.TtsPlayer;
 import com.mapswithme.maps.ugc.UGC;
 import com.mapswithme.util.Config;
@@ -270,6 +271,7 @@ public class MwmApplication extends Application
     MapManager.nativeSubscribe(mStorageCallbacks);
 
     initNativeStrings();
+    SearchEngine.INSTANCE.initialize();
     BookmarkManager.loadBookmarks();
     TtsPlayer.INSTANCE.init(this);
     ThemeSwitcher.restart(false);
diff --git a/android/src/com/mapswithme/maps/search/SearchEngine.java b/android/src/com/mapswithme/maps/search/SearchEngine.java
index d2ba78aa5d..72e1874b8e 100644
--- a/android/src/com/mapswithme/maps/search/SearchEngine.java
+++ b/android/src/com/mapswithme/maps/search/SearchEngine.java
@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 
 import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.api.ParsedMwmRequest;
+import com.mapswithme.maps.base.Initializable;
 import com.mapswithme.maps.bookmarks.data.FeatureId;
 import com.mapswithme.util.Language;
 import com.mapswithme.util.Listeners;
@@ -15,7 +16,8 @@ import java.io.UnsupportedEncodingException;
 
 public enum SearchEngine implements NativeSearchListener,
                                     NativeMapSearchListener,
-                                    NativeBookingFilterListener
+                                    NativeBookingFilterListener,
+                                    Initializable
 {
   INSTANCE;
 
@@ -119,11 +121,6 @@ public enum SearchEngine implements NativeSearchListener,
     mHotelListeners.unregister(listener);
   }
 
-  SearchEngine()
-  {
-    nativeInit();
-  }
-
   private native void nativeInit();
 
   /**
@@ -218,6 +215,18 @@ public enum SearchEngine implements NativeSearchListener,
     nativeShowResult(index);
   }
 
+  @Override
+  public void initialize()
+  {
+    nativeInit();
+  }
+
+  @Override
+  public void destroy()
+  {
+    // Do nothing.
+  }
+
   /**
    * @param bytes utf-8 formatted bytes of query.
    */