From 292ef88a636d6cc25b72af4b79aae225439f6fd4 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Fri, 7 May 2021 10:11:09 +0300
Subject: [PATCH] [android] Remove lazy initialization of platform

Closes #386

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
---
 android/src/com/mapswithme/maps/MwmApplication.java      | 7 +++----
 .../src/com/mapswithme/maps/MwmBroadcastReceiver.java    | 9 ++-------
 android/src/com/mapswithme/maps/MwmJobIntentService.java | 9 ++-------
 android/src/com/mapswithme/maps/SplashActivity.java      | 2 +-
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java
index bc5427fce2..1a6d784532 100644
--- a/android/src/com/mapswithme/maps/MwmApplication.java
+++ b/android/src/com/mapswithme/maps/MwmApplication.java
@@ -64,8 +64,8 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
   @NonNull
   private MapDownloadManager mMapDownloadManager;
 
-  private boolean mFrameworkInitialized;
-  private boolean mPlatformInitialized;
+  private volatile boolean mFrameworkInitialized;
+  private volatile boolean mPlatformInitialized;
 
   private Handler mMainLoopHandler;
   private final Object mMainQueueToken = new Object();
@@ -164,11 +164,10 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
   /**
    * Initialize native core of application: platform and framework.
    *
-   * @return boolean - indicator whether native initialization is successful or not.
    * @throws IOException - if failed to create directories. Caller must handle
    * the exception and do nothing with native code if initialization is failed.
    */
-  public void ensureCoreInitialized() throws IOException
+  public void init() throws IOException
   {
     initNativePlatform();
     initNativeFramework();
diff --git a/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java b/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java
index d022508c8f..7090e1af2b 100644
--- a/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java
+++ b/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java
@@ -11,8 +11,6 @@ import com.mapswithme.util.CrashlyticsUtils;
 import com.mapswithme.util.log.Logger;
 import com.mapswithme.util.log.LoggerFactory;
 
-import java.io.IOException;
-
 public abstract class MwmBroadcastReceiver extends BroadcastReceiver
 {
   private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
@@ -32,12 +30,9 @@ public abstract class MwmBroadcastReceiver extends BroadcastReceiver
     String msg = "onReceive: " + intent;
     LOGGER.i(getTag(), msg);
     CrashlyticsUtils.INSTANCE.log(Log.INFO, getTag(), msg);
-    try
+    if (!app.arePlatformAndCoreInitialized())
     {
-      app.ensureCoreInitialized();
-    } catch (IOException e)
-    {
-      LOGGER.e(getTag(), "Failed to initialize application, ignoring " + intent);
+      LOGGER.w(getTag(), "Application is not initialized, ignoring " + intent);
       return;
     }
 
diff --git a/android/src/com/mapswithme/maps/MwmJobIntentService.java b/android/src/com/mapswithme/maps/MwmJobIntentService.java
index 37441f5437..65ef7b2a11 100644
--- a/android/src/com/mapswithme/maps/MwmJobIntentService.java
+++ b/android/src/com/mapswithme/maps/MwmJobIntentService.java
@@ -10,8 +10,6 @@ import com.mapswithme.util.CrashlyticsUtils;
 import com.mapswithme.util.log.Logger;
 import com.mapswithme.util.log.LoggerFactory;
 
-import java.io.IOException;
-
 public abstract class MwmJobIntentService extends JobIntentService
 {
   private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
@@ -31,12 +29,9 @@ public abstract class MwmJobIntentService extends JobIntentService
     String msg = "onHandleWork: " + intent;
     LOGGER.i(getTag(), msg);
     CrashlyticsUtils.INSTANCE.log(Log.INFO, getTag(), msg);
-    try
+    if (!app.arePlatformAndCoreInitialized())
     {
-      app.ensureCoreInitialized();
-    } catch (IOException e)
-    {
-      LOGGER.e(getTag(), "Failed to initialize application, ignoring " + intent);
+      LOGGER.w(getTag(), "Application is not initialized, ignoring " + intent);
       return;
     }
 
diff --git a/android/src/com/mapswithme/maps/SplashActivity.java b/android/src/com/mapswithme/maps/SplashActivity.java
index 4d9e76d42e..89b7a211d6 100644
--- a/android/src/com/mapswithme/maps/SplashActivity.java
+++ b/android/src/com/mapswithme/maps/SplashActivity.java
@@ -159,7 +159,7 @@ public class SplashActivity extends AppCompatActivity implements BaseActivity
     MwmApplication app = MwmApplication.from(this);
     try
     {
-      app.ensureCoreInitialized();
+      app.init();
     } catch (IOException e)
     {
       showFatalErrorDialog(R.string.dialog_error_storage_title, R.string.dialog_error_storage_message);