From c1fbd52f28179f20d8f6b6d86b39eb4c3e8f5638 Mon Sep 17 00:00:00 2001 From: Maxr1998 Date: Sun, 23 Aug 2020 19:38:45 +0200 Subject: [PATCH 1/2] Simple workaround for ApiClient NPE Crash happens when returning to app after application has been destroyed and the ApiClient is null. --- .../ui/activities/base/AbsBaseActivity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 4fcde831..dc490d47 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 @@ -10,6 +10,9 @@ import android.os.Bundle; 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; @@ -28,6 +31,15 @@ public abstract class AbsBaseActivity extends AbsThemeActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + 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(); From 6ff4113cccef51539a7396d8111a96426af83fe8 Mon Sep 17 00:00:00 2001 From: Max Rumpf Date: Thu, 27 Aug 2020 13:12:50 +0200 Subject: [PATCH 2/2] Add TODO for splash activity Co-authored-by: dkanada --- .../dkanada/gramophone/ui/activities/base/AbsBaseActivity.java | 1 + 1 file changed, 1 insertion(+) 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 dc490d47..b1871077 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 @@ -32,6 +32,7 @@ public abstract class AbsBaseActivity extends AbsThemeActivity { 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);