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

fix permission check on main activity

Browse source
This commit is contained in:
dkanada 2021-05-04 20:25:36 +09:00
commit 3594a7c9ee
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ public abstract class AbsBaseActivity extends AbsThemeActivity {
protected void onPostCreate(@Nullable Bundle savedInstanceState) { protected void onPostCreate(@Nullable Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState); super.onPostCreate(savedInstanceState);
if (!getClass().isInstance(MainActivity.class)) { if (!(this instanceof MainActivity)) {
return; return;
} }

4
app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
View file

@ -65,24 +65,28 @@ public class NavigationUtil {
public static void startArtist(@NonNull final Activity activity, final Artist artist, @Nullable Pair... sharedElements) { public static void startArtist(@NonNull final Activity activity, final Artist artist, @Nullable Pair... sharedElements) {
final Intent intent = new Intent(activity, ArtistDetailActivity.class); final Intent intent = new Intent(activity, ArtistDetailActivity.class);
intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST, artist); intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST, artist);
startActivitySharedElements(activity, intent, sharedElements); startActivitySharedElements(activity, intent, sharedElements);
} }
public static void startAlbum(@NonNull final Activity activity, final Album album, @Nullable Pair... sharedElements) { public static void startAlbum(@NonNull final Activity activity, final Album album, @Nullable Pair... sharedElements) {
final Intent intent = new Intent(activity, AlbumDetailActivity.class); final Intent intent = new Intent(activity, AlbumDetailActivity.class);
intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM, album); intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM, album);
startActivitySharedElements(activity, intent, sharedElements); startActivitySharedElements(activity, intent, sharedElements);
} }
public static void startGenre(@NonNull final Activity activity, final Genre genre, @Nullable Pair... sharedElements) { public static void startGenre(@NonNull final Activity activity, final Genre genre, @Nullable Pair... sharedElements) {
final Intent intent = new Intent(activity, GenreDetailActivity.class); final Intent intent = new Intent(activity, GenreDetailActivity.class);
intent.putExtra(GenreDetailActivity.EXTRA_GENRE, genre); intent.putExtra(GenreDetailActivity.EXTRA_GENRE, genre);
startActivitySharedElements(activity, intent, sharedElements); startActivitySharedElements(activity, intent, sharedElements);
} }
public static void startPlaylist(@NonNull final Activity activity, final Playlist playlist, @Nullable Pair... sharedElements) { public static void startPlaylist(@NonNull final Activity activity, final Playlist playlist, @Nullable Pair... sharedElements) {
final Intent intent = new Intent(activity, PlaylistDetailActivity.class); final Intent intent = new Intent(activity, PlaylistDetailActivity.class);
intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist); intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist);
startActivitySharedElements(activity, intent, sharedElements); startActivitySharedElements(activity, intent, sharedElements);
} }