#2929 - minor coding style tweaks per review

This commit is contained in:
orionlee 2019-09-22 11:03:09 -07:00
parent e18d8f3514
commit 427477b256

View File

@ -394,7 +394,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
final FeedItem feedItem = getFeedItem(media); // some options option requires FeedItem final FeedItem feedItem = getFeedItem(media); // some options option requires FeedItem
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.add_to_favorites_item: case R.id.add_to_favorites_item:
if(feedItem != null) { if (feedItem != null) {
DBWriter.addFavoriteItem(feedItem); DBWriter.addFavoriteItem(feedItem);
isFavorite = true; isFavorite = true;
invalidateOptionsMenu(); invalidateOptionsMenu();
@ -403,7 +403,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
} }
break; break;
case R.id.remove_from_favorites_item: case R.id.remove_from_favorites_item:
if(feedItem != null) { if (feedItem != null) {
DBWriter.removeFavoriteItem(feedItem); DBWriter.removeFavoriteItem(feedItem);
isFavorite = false; isFavorite = false;
invalidateOptionsMenu(); invalidateOptionsMenu();
@ -874,7 +874,7 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
@Nullable @Nullable
private static FeedItem getFeedItem(@Nullable Playable playable) { private static FeedItem getFeedItem(@Nullable Playable playable) {
if (playable instanceof FeedMedia) { if ((playable != null) && (playable instanceof FeedMedia)) {
return ((FeedMedia)playable).getItem(); return ((FeedMedia)playable).getItem();
} else { } else {
return null; return null;