[android] Renamed safeOnCreate/safeOnDestroyed methods

android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java

@@ -212,9 +212,9 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
 
   @CallSuper
   @Override
-  protected void safeOnCreate(@Nullable Bundle savedInstanceState)
+  protected void onSafeCreate(@Nullable Bundle savedInstanceState)
   {
-    super.safeOnCreate(savedInstanceState);
+    super.onSafeCreate(savedInstanceState);
     setContentView(R.layout.activity_download_resources);
     initViewsAndListeners();
 
@@ -237,9 +237,9 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
 
   @CallSuper
   @Override
-  protected void safeOnDestroy()
+  protected void onSafeDestroy()
   {
-    super.safeOnDestroy();
+    super.onSafeDestroy();
     Utils.keepScreenOn(false, getWindow());
     if (mCountryDownloadListenerSlot != 0)
     {

android/src/com/mapswithme/maps/MwmActivity.java

@@ -466,9 +466,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @SuppressLint("InlinedApi")
   @CallSuper
   @Override
-  protected void safeOnCreate(@Nullable Bundle savedInstanceState)
+  protected void onSafeCreate(@Nullable Bundle savedInstanceState)
   {
-    super.safeOnCreate(savedInstanceState);
+    super.onSafeCreate(savedInstanceState);
     if (savedInstanceState != null)
       mLocationErrorDialogAnnoying = savedInstanceState.getBoolean(EXTRA_LOCATION_DIALOG_IS_ANNOYING);
     mIsTabletLayout = getResources().getBoolean(R.bool.tabletLayout);
@@ -1241,9 +1241,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   @CallSuper
   @Override
-  protected void safeOnDestroy()
+  protected void onSafeDestroy()
   {
-    super.safeOnDestroy();
+    super.onSafeDestroy();
     if (mAdsRemovalPurchaseController != null)
       mAdsRemovalPurchaseController.destroy();
     if (mBookmarkPurchaseController != null)

android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java

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

android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java

@@ -56,7 +56,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
    * Shows splash screen and initializes the core in case when it was not initialized.
    *
    * Do not override this method!
-   * Use {@link #safeOnCreate(Bundle savedInstanceState)}
+   * Use {@link #onSafeCreate(Bundle savedInstanceState)}
    */
   @CallSuper
   @Override
@@ -78,10 +78,9 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
       return;
     }
 
-    mBaseDelegate.onCreate();
     super.onCreate(savedInstanceState);
 
-    safeOnCreate(savedInstanceState);
+    onSafeCreate(savedInstanceState);
   }
 
   /**
@@ -89,7 +88,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
    * When this method is called, the core is already initialized.
    */
   @CallSuper
-  protected void safeOnCreate(@Nullable Bundle savedInstanceState)
+  protected void onSafeCreate(@Nullable Bundle savedInstanceState)
   {
     setVolumeControlStream(AudioManager.STREAM_MUSIC);
     final int layoutId = getContentLayoutResId();
@@ -162,16 +161,16 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
     if (!mSafeCreated)
       return;
 
-    safeOnDestroy();
+    onSafeDestroy();
   }
 
   /**
    * Use this safe method instead of {@link #onDestroy()}.
    * When this method is called, the core is already initialized and
-   * {@link #safeOnCreate(Bundle savedInstanceState)} was called.
+   * {@link #onSafeCreate(Bundle savedInstanceState)} was called.
    */
   @CallSuper
-  protected void safeOnDestroy()
+  protected void onSafeDestroy()
   {
     mBaseDelegate.onSafeDestroy();
     mSafeCreated = false;

android/src/com/mapswithme/maps/base/BaseToolbarActivity.java

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

android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java

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

android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java

@@ -23,9 +23,9 @@ public class BookmarkPaymentActivity extends BaseMwmFragmentActivity
   }
 
   @Override
-  protected void safeOnCreate(@Nullable Bundle savedInstanceState)
+  protected void onSafeCreate(@Nullable Bundle savedInstanceState)
   {
-    super.safeOnCreate(savedInstanceState);
+    super.onSafeCreate(savedInstanceState);
     overridePendingTransition(0, 0);
   }
 

android/src/com/mapswithme/maps/search/SearchActivity.java

@@ -55,18 +55,18 @@ public class SearchActivity extends BaseMwmFragmentActivity
   }
 
   @Override
-  protected void safeOnCreate(@Nullable Bundle savedInstanceState)
+  protected void onSafeCreate(@Nullable Bundle savedInstanceState)
   {
-    super.safeOnCreate(savedInstanceState);
+    super.onSafeCreate(savedInstanceState);
     mAdsRemovalPurchaseController = PurchaseFactory.createAdsRemovalPurchaseController(this);
     mAdsRemovalPurchaseController.initialize(this);
   }
 
   @CallSuper
   @Override
-  protected void safeOnDestroy()
+  protected void onSafeDestroy()
   {
-    super.safeOnDestroy();
+    super.onSafeDestroy();
     if (mAdsRemovalPurchaseController != null)
       mAdsRemovalPurchaseController.destroy();
   }