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

[andoid] The method onCreate from BaseMwmFragmentActivity is finalized

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-04-17 10:51:05 +03:00 • committed by Aleksandr Zatsepin
parent 7bbfa035c0
commit 67bd4090a2
6 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
View file

@ -218,9 +218,9 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
@CallSuper
@Override
protected void onCreate(@Nullable Bundle savedInstanceState)
protected void safeOnCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
super.safeOnCreate(savedInstanceState);
setContentView(R.layout.activity_download_resources);
initViewsAndListeners();

4
android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java
View file

@ -13,9 +13,9 @@ public class BaseMwmExtraTitleActivity extends BaseMwmFragmentActivity
@Override
@CallSuper
protected void onCreate(Bundle savedInstanceState)
protected void safeOnCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
super.safeOnCreate(savedInstanceState);
String title = "";
Bundle bundle = getIntent().getExtras();

13
android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
View file

@ -14,7 +14,6 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.maps.SplashActivity;
@ -50,9 +49,15 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
}
/**
* Shows splash screen and initializes the core in case when it was not initialized.
*
* Do not override this method!
* Use {@link #safeOnCreate(Bundle savedInstanceState)}
*/
@CallSuper
@Override
protected void onCreate(@Nullable Bundle savedInstanceState)
protected final void onCreate(@Nullable Bundle savedInstanceState)
{
if (!MwmApplication.get().arePlatformAndCoreInitialized()
|| !PermissionsUtils.isExternalStorageGranted())
@ -69,6 +74,10 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
safeOnCreate(savedInstanceState);
}
/**
* Use this safe method instead of {@link #onCreate(Bundle savedInstanceState)}.
* When this method is called, the core is already initialized.
*/
@CallSuper
protected void safeOnCreate(@Nullable Bundle savedInstanceState)
{

4
android/src/com/mapswithme/maps/base/BaseToolbarActivity.java
View file

@ -14,9 +14,9 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
{
@CallSuper
@Override
protected void onCreate(@Nullable Bundle savedInstanceState)
protected void safeOnCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
super.safeOnCreate(savedInstanceState);
Toolbar toolbar = getToolbar();
if (toolbar != null)

7
android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java
View file

@ -1,7 +1,6 @@
package com.mapswithme.maps.editor;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import com.mapswithme.maps.base.BaseMwmFragmentActivity;
@ -11,12 +10,6 @@ public class FeatureCategoryActivity extends BaseMwmFragmentActivity implements
{
public static final String EXTRA_FEATURE_CATEGORY = "FeatureCategory";
@Override
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
}
@Override
protected Class<? extends Fragment> getFragmentClass()
{

4
android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java
View file

@ -55,12 +55,12 @@ public class FullScreenGalleryActivity extends BaseMwmFragmentActivity
}
@Override
protected void onCreate(Bundle savedInstanceState)
protected void safeOnCreate(Bundle savedInstanceState)
{
requestWindowFeature(Window.FEATURE_NO_TITLE);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
super.onCreate(savedInstanceState);
super.safeOnCreate(savedInstanceState);
Toolbar toolbar = getToolbar();
toolbar.setTitle("");
UiUtils.showHomeUpButton(toolbar);