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

Merge pull request #82 from Maxr1998/fix-apiclient-crash

Browse source 
Simple workaround for ApiClient NPE
This commit is contained in:
dkanada 2020-08-29 12:08:10 +09:00 • committed by GitHub
commit b72d183a42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,9 @@ import android.os.Bundle;
import android.provider.Settings; 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;
@ -28,6 +31,16 @@ 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();