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

[android] Fixed core initialization for splash screen, replaced init core flag to Application method call

Browse source
This commit is contained in:
Dmitry Donskoy 2018-09-29 00:35:39 +03:00 • committed by Aleksandr Zatsepin
parent 7ba17e82f6
commit 7fe7f8db7a
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
android/src/com/mapswithme/maps/SplashActivity.java
View file

@ -55,7 +55,6 @@ public class SplashActivity extends AppCompatActivity
private boolean mPermissionsGranted;
private boolean mNeedStoragePermission;
private boolean mCanceled;
private boolean mCoreInitialized;
@NonNull
private final Runnable mPermissionsDelayedTask = new Runnable()
@ -73,7 +72,8 @@ public class SplashActivity extends AppCompatActivity
@Override
public void run()
{
if (mCoreInitialized)
MwmApplication app = (MwmApplication) getApplication();
if (app.arePlatformAndCoreInitialized())
{
UiThread.runLater(mFinalDelayedTask);
return;
@ -97,8 +97,8 @@ public class SplashActivity extends AppCompatActivity
}
init();
LOGGER.i(TAG, "Core initialized: " + mCoreInitialized);
if (mCoreInitialized)
LOGGER.i(TAG, "Core initialized: " + app.arePlatformAndCoreInitialized());
if (app.arePlatformAndCoreInitialized())
{
if (mediator.isLimitAdTrackingEnabled())
{
@ -151,8 +151,6 @@ public class SplashActivity extends AppCompatActivity
{
super.onCreate(savedInstanceState);
mBaseDelegate.onCreate();
if (savedInstanceState != null)
mCoreInitialized = savedInstanceState.getBoolean(EXTRA_CORE_INITIALIZED);
handleUpdateMapsFragmentCorrectly(savedInstanceState);
UiThread.cancelDelayedTasks(mPermissionsDelayedTask);
UiThread.cancelDelayedTasks(mInitCoreDelayedTask);
@ -161,13 +159,6 @@ public class SplashActivity extends AppCompatActivity
initView();
}
@Override
protected void onSaveInstanceState(Bundle outState)
{
super.onSaveInstanceState(outState);
outState.putBoolean(EXTRA_CORE_INITIALIZED, mCoreInitialized);
}
@Override
protected void onNewIntent(Intent intent)
{
@ -280,7 +271,8 @@ public class SplashActivity extends AppCompatActivity
if (mCanceled)
return;
if (!mCoreInitialized)
MwmApplication app = (MwmApplication) getApplication();
if (!app.arePlatformAndCoreInitialized())
{
showExternalStorageErrorDialog();
return;
@ -375,7 +367,7 @@ public class SplashActivity extends AppCompatActivity
private void init()
{
mCoreInitialized = MwmApplication.get().initCore();
MwmApplication.get().initCore();
}
@SuppressWarnings("unchecked")