From 2efcb4b444f05b8c87996b2fef8c51e3c12f15aa Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sat, 29 Aug 2020 12:18:06 +0900
Subject: [PATCH] fix crash during app start

---
 .../ui/activities/base/AbsBaseActivity.java         | 12 ------------
 .../base/AbsSlidingMusicPanelActivity.java          | 13 +++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java
index b1871077..a0cf842a 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java
@@ -11,8 +11,6 @@ import android.provider.Settings;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.dkanada.gramophone.App;
-import com.dkanada.gramophone.ui.activities.SplashActivity;
 import com.google.android.material.snackbar.Snackbar;
 import androidx.core.app.ActivityCompat;
 import android.view.KeyEvent;
@@ -31,16 +29,6 @@ public abstract class AbsBaseActivity extends AbsThemeActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        // TODO use a fragment for the splash activity
-        if (App.getApiClient() == null) {
-            Intent intent = new Intent(this, SplashActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-            startActivity(intent);
-            finish();
-            return;
-        }
-
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
         permissions = getPermissionsToRequest();
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
index d09c97b7..74d7847f 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
@@ -3,6 +3,7 @@ package com.dkanada.gramophone.ui.activities.base;
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.ColorInt;
@@ -14,8 +15,10 @@ import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.animation.PathInterpolator;
 
+import com.dkanada.gramophone.App;
 import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
+import com.dkanada.gramophone.ui.activities.SplashActivity;
 import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
 import com.dkanada.gramophone.ui.fragments.player.MiniPlayerFragment;
 import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen;
@@ -50,6 +53,15 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
         setContentView(createContentView());
         ButterKnife.bind(this);
 
+        // TODO use a fragment for the splash activity
+        if (App.getApiClient() == null) {
+            Intent intent = new Intent(this, SplashActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            startActivity(intent);
+            finish();
+            return;
+        }
+
         currentNowPlayingScreen = PreferenceUtil.getInstance(this).getNowPlayingScreen();
 
         // must implement AbsPlayerFragment
@@ -63,6 +75,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
                 fragment = new CardPlayerFragment();
                 break;
         }
+
         getSupportFragmentManager().beginTransaction().replace(R.id.player_fragment_container, fragment).commit();
         getSupportFragmentManager().executePendingTransactions();