tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix crash during app start

Browse source
This commit is contained in:
dkanada 2020-08-29 12:18:06 +09:00
commit 2efcb4b444
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java
View file

@ -11,8 +11,6 @@ import android.provider.Settings;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.dkanada.gramophone.App;
import com.dkanada.gramophone.ui.activities.SplashActivity;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import android.view.KeyEvent; import android.view.KeyEvent;
@ -31,16 +29,6 @@ public abstract class AbsBaseActivity extends AbsThemeActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(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); setVolumeControlStream(AudioManager.STREAM_MUSIC);
permissions = getPermissionsToRequest(); permissions = getPermissionsToRequest();

13
app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
View file

@ -3,6 +3,7 @@ package com.dkanada.gramophone.ui.activities.base;
import android.animation.ArgbEvaluator; import android.animation.ArgbEvaluator;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
@ -14,8 +15,10 @@ import android.view.ViewGroup;
import android.view.ViewTreeObserver; import android.view.ViewTreeObserver;
import android.view.animation.PathInterpolator; import android.view.animation.PathInterpolator;
import com.dkanada.gramophone.App;
import com.dkanada.gramophone.R; import com.dkanada.gramophone.R;
import com.dkanada.gramophone.helper.MusicPlayerRemote; 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.AbsPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.MiniPlayerFragment; import com.dkanada.gramophone.ui.fragments.player.MiniPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen; import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen;
@ -50,6 +53,15 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
setContentView(createContentView()); setContentView(createContentView());
ButterKnife.bind(this); 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(); currentNowPlayingScreen = PreferenceUtil.getInstance(this).getNowPlayingScreen();
// must implement AbsPlayerFragment // must implement AbsPlayerFragment
@ -63,6 +75,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
fragment = new CardPlayerFragment(); fragment = new CardPlayerFragment();
break; break;
} }
getSupportFragmentManager().beginTransaction().replace(R.id.player_fragment_container, fragment).commit(); getSupportFragmentManager().beginTransaction().replace(R.id.player_fragment_container, fragment).commit();
getSupportFragmentManager().executePendingTransactions(); getSupportFragmentManager().executePendingTransactions();