From 3594a7c9ee3681db1dd541a8af5bac67d644ebf1 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Tue, 4 May 2021 20:25:36 +0900
Subject: [PATCH] fix permission check on main activity

---
 .../dkanada/gramophone/activities/base/AbsBaseActivity.java   | 2 +-
 .../main/java/com/dkanada/gramophone/util/NavigationUtil.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java
index feafc58c..541fa204 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java
@@ -45,7 +45,7 @@ public abstract class AbsBaseActivity extends AbsThemeActivity {
     protected void onPostCreate(@Nullable Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
 
-        if (!getClass().isInstance(MainActivity.class)) {
+        if (!(this instanceof MainActivity)) {
             return;
         }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
index e3af7802..0ff918f4 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
@@ -65,24 +65,28 @@ public class NavigationUtil {
 
     public static void startArtist(@NonNull final Activity activity, final Artist artist, @Nullable Pair... sharedElements) {
         final Intent intent = new Intent(activity, ArtistDetailActivity.class);
+
         intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST, artist);
         startActivitySharedElements(activity, intent, sharedElements);
     }
 
     public static void startAlbum(@NonNull final Activity activity, final Album album, @Nullable Pair... sharedElements) {
         final Intent intent = new Intent(activity, AlbumDetailActivity.class);
+
         intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM, album);
         startActivitySharedElements(activity, intent, sharedElements);
     }
 
     public static void startGenre(@NonNull final Activity activity, final Genre genre, @Nullable Pair... sharedElements) {
         final Intent intent = new Intent(activity, GenreDetailActivity.class);
+
         intent.putExtra(GenreDetailActivity.EXTRA_GENRE, genre);
         startActivitySharedElements(activity, intent, sharedElements);
     }
 
     public static void startPlaylist(@NonNull final Activity activity, final Playlist playlist, @Nullable Pair... sharedElements) {
         final Intent intent = new Intent(activity, PlaylistDetailActivity.class);
+
         intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist);
         startActivitySharedElements(activity, intent, sharedElements);
     }