Replace if with switch

app/src/main/java/net/nullsum/audinaut/activity/EditPlayActionActivity.java

@@ -173,13 +173,14 @@ public class EditPlayActionActivity extends SubsonicActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
                 cancel();
                 return true;
-        } else if (item.getItemId() == R.id.menu_accept) {
+            case R.id.menu_accept:
                 accept();
                 return true;
-        } else if (item.getItemId() == R.id.menu_cancel) {
+            case R.id.menu_cancel:
                 cancel();
                 return true;
         }

app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java

@@ -538,11 +538,12 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
     }
 
     private SubsonicFragment getNewFragment(String fragmentType) {
-        if ("Playlist".equals(fragmentType)) {
+        switch (fragmentType) {
+            case "Playlist":
                 return new SelectPlaylistFragment();
-        } else if ("Download".equals(fragmentType)) {
+            case "Download":
                 return new DownloadFragment();
-        } else {
+            default:
                 return new SelectArtistFragment();
         }
     }

app/src/main/java/net/nullsum/audinaut/adapter/SearchAdapter.java

@@ -78,12 +78,17 @@ public class SearchAdapter extends ExpandableSectionAdapter<Serializable> {
     @Override
     public UpdateView.UpdateViewHolder onCreateSectionViewHolder(int viewType) {
         UpdateView updateView = null;
-        if (viewType == VIEW_TYPE_ALBUM_CELL || viewType == VIEW_TYPE_ALBUM_LINE) {
+        switch (viewType) {
+            case VIEW_TYPE_ALBUM_CELL:
+            case VIEW_TYPE_ALBUM_LINE:
                 updateView = new AlbumView(context, viewType == VIEW_TYPE_ALBUM_CELL);
-        } else if (viewType == VIEW_TYPE_SONG) {
+                break;
+            case VIEW_TYPE_SONG:
                 updateView = new SongView(context);
-        } else if (viewType == VIEW_TYPE_ARTIST) {
+                break;
+            case VIEW_TYPE_ARTIST:
                 updateView = new ArtistView(context);
+                break;
         }
 
         return new UpdateView.UpdateViewHolder(updateView);
@@ -92,14 +97,19 @@ public class SearchAdapter extends ExpandableSectionAdapter<Serializable> {
     @Override
     public void onBindViewHolder(UpdateView.UpdateViewHolder holder, Serializable item, int viewType) {
         UpdateView view = holder.getUpdateView();
-        if (viewType == VIEW_TYPE_ALBUM_CELL || viewType == VIEW_TYPE_ALBUM_LINE) {
+        switch (viewType) {
+            case VIEW_TYPE_ALBUM_CELL:
+            case VIEW_TYPE_ALBUM_LINE:
                 AlbumView albumView = (AlbumView) view;
                 albumView.setObject((Entry) item, imageLoader);
-        } else if (viewType == VIEW_TYPE_SONG) {
+                break;
+            case VIEW_TYPE_SONG:
                 SongView songView = (SongView) view;
                 songView.setObject((Entry) item, true);
-        } else if (viewType == VIEW_TYPE_ARTIST) {
+                break;
+            case VIEW_TYPE_ARTIST:
                 view.setObject(item);
+                break;
         }
     }
 

app/src/main/java/net/nullsum/audinaut/fragments/MainFragment.java

@@ -75,13 +75,18 @@ public class MainFragment extends SelectRecyclerFragment<Integer> {
     }
 
     private void showAlbumList(String type) {
-        if ("genres".equals(type)) {
+        switch (type) {
+            case "genres": {
                 SubsonicFragment fragment = new SelectGenreFragment();
                 replaceFragment(fragment);
-        } else if ("years".equals(type)) {
+                break;
+            }
+            case "years": {
                 SubsonicFragment fragment = new SelectYearFragment();
                 replaceFragment(fragment);
-        } else {
+                break;
+            }
+            default: {
                 // Clear out recently added count when viewing
                 if ("newest".equals(type)) {
                     SharedPreferences.Editor editor = Util.getPreferences(context).edit();
@@ -97,31 +102,44 @@ public class MainFragment extends SelectRecyclerFragment<Integer> {
                 fragment.setArguments(args);
 
                 replaceFragment(fragment);
+                break;
+            }
         }
     }
 
     @Override
     public void onItemClicked(UpdateView<Integer> updateView, Integer item) {
-        if (item == R.string.main_albums_random) {
+        switch (item) {
+            case R.string.main_albums_random:
                 showAlbumList("random");
-        } else if (item == R.string.main_albums_recent) {
+                break;
+            case R.string.main_albums_recent:
                 showAlbumList("recent");
-        } else if (item == R.string.main_albums_frequent) {
+                break;
+            case R.string.main_albums_frequent:
                 showAlbumList("frequent");
-        } else if (item == R.string.main_albums_genres) {
+                break;
+            case R.string.main_albums_genres:
                 showAlbumList("genres");
-        } else if (item == R.string.main_albums_year) {
+                break;
+            case R.string.main_albums_year:
                 showAlbumList("years");
-        } else if (item == R.string.main_albums_alphabetical) {
+                break;
+            case R.string.main_albums_alphabetical:
                 showAlbumList("alphabeticalByName");
-        } else if (item == R.string.main_songs_newest) {
+                break;
+            case R.string.main_songs_newest:
                 showAlbumList(SONGS_NEWEST);
-        } else if (item == R.string.main_songs_top_played) {
+                break;
+            case R.string.main_songs_top_played:
                 showAlbumList(SONGS_TOP_PLAYED);
-        } else if (item == R.string.main_songs_recent) {
+                break;
+            case R.string.main_songs_recent:
                 showAlbumList(SONGS_RECENT);
-        } else if (item == R.string.main_songs_frequent) {
+                break;
+            case R.string.main_songs_frequent:
                 showAlbumList(SONGS_FREQUENT);
+                break;
         }
     }
 

app/src/main/java/net/nullsum/audinaut/fragments/SelectDirectoryFragment.java

@@ -315,25 +315,37 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section
     }
 
     private void getAlbumList(final String albumListType, final int size, final boolean refresh) {
-        if ("random".equals(albumListType)) {
+        switch (albumListType) {
+            case "random":
                 setTitle(R.string.main_albums_random);
-        } else if ("recent".equals(albumListType)) {
+                break;
+            case "recent":
                 setTitle(R.string.main_albums_recent);
-        } else if ("frequent".equals(albumListType)) {
+                break;
+            case "frequent":
                 setTitle(R.string.main_albums_frequent);
-        } else if ("genres".equals(albumListType) || "years".equals(albumListType)) {
+                break;
+            case "genres":
+            case "years":
                 setTitle(albumListExtra);
-        } else if ("alphabeticalByName".equals(albumListType)) {
+                break;
+            case "alphabeticalByName":
                 setTitle(R.string.main_albums_alphabetical);
+                break;
         }
-        if (MainFragment.SONGS_NEWEST.equals(albumListType)) {
+        switch (albumListType) {
+            case MainFragment.SONGS_NEWEST:
                 setTitle(R.string.main_songs_newest);
-        } else if (MainFragment.SONGS_TOP_PLAYED.equals(albumListType)) {
+                break;
+            case MainFragment.SONGS_TOP_PLAYED:
                 setTitle(R.string.main_songs_top_played);
-        } else if (MainFragment.SONGS_RECENT.equals(albumListType)) {
+                break;
+            case MainFragment.SONGS_RECENT:
                 setTitle(R.string.main_songs_recent);
-        } else if (MainFragment.SONGS_FREQUENT.equals(albumListType)) {
+                break;
+            case MainFragment.SONGS_FREQUENT:
                 setTitle(R.string.main_songs_frequent);
+                break;
         }
 
         new LoadTask() {

app/src/main/java/net/nullsum/audinaut/fragments/SettingsFragment.java

@@ -116,14 +116,19 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
         Bundle args = new Bundle();
 
         int xml = 0;
-        if ("appearance".equals(name)) {
+        switch (name) {
+            case "appearance":
                 xml = R.xml.settings_appearance;
-        } else if ("cache".equals(name)) {
+                break;
+            case "cache":
                 xml = R.xml.settings_cache;
-        } else if ("playback".equals(name)) {
+                break;
+            case "playback":
                 xml = R.xml.settings_playback;
-        } else if ("servers".equals(name)) {
+                break;
+            case "servers":
                 xml = R.xml.settings_servers;
+                break;
         }
 
         if (xml != 0) {
@@ -142,20 +147,28 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
 
         update();
 
-        if (Constants.PREFERENCES_KEY_HIDE_MEDIA.equals(key)) {
+        switch (key) {
+            case Constants.PREFERENCES_KEY_HIDE_MEDIA:
                 setHideMedia(sharedPreferences.getBoolean(key, true));
-        } else if (Constants.PREFERENCES_KEY_MEDIA_BUTTONS.equals(key)) {
+                break;
+            case Constants.PREFERENCES_KEY_MEDIA_BUTTONS:
                 setMediaButtonsEnabled(sharedPreferences.getBoolean(key, true));
-        } else if (Constants.PREFERENCES_KEY_CACHE_LOCATION.equals(key)) {
+                break;
+            case Constants.PREFERENCES_KEY_CACHE_LOCATION:
                 setCacheLocation(sharedPreferences.getString(key, ""));
-        } else if (Constants.PREFERENCES_KEY_SYNC_MOST_RECENT.equals(key)) {
+                break;
+            case Constants.PREFERENCES_KEY_SYNC_MOST_RECENT:
                 SyncUtil.removeMostRecentSyncFiles(context);
-        } else if (Constants.PREFERENCES_KEY_REPLAY_GAIN.equals(key) || Constants.PREFERENCES_KEY_REPLAY_GAIN_BUMP.equals(key) || Constants.PREFERENCES_KEY_REPLAY_GAIN_UNTAGGED.equals(key)) {
+                break;
+            case Constants.PREFERENCES_KEY_REPLAY_GAIN:
+            case Constants.PREFERENCES_KEY_REPLAY_GAIN_BUMP:
+            case Constants.PREFERENCES_KEY_REPLAY_GAIN_UNTAGGED:
                 DownloadService downloadService = DownloadService.getInstance();
                 if (downloadService != null) {
                     downloadService.reapplyVolume();
                 }
-        } else if (Constants.PREFERENCES_KEY_START_ON_HEADPHONES.equals(key)) {
+                break;
+            case Constants.PREFERENCES_KEY_START_ON_HEADPHONES:
                 Intent serviceIntent = new Intent();
                 serviceIntent.setClassName(context.getPackageName(), HeadphoneListenerService.class.getName());
 
@@ -164,6 +177,7 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
                 } else {
                     context.stopService(serviceIntent);
                 }
+                break;
         }
 
         scheduleBackup();

app/src/main/java/net/nullsum/audinaut/service/DownloadService.java

@@ -884,13 +884,19 @@ public class DownloadService extends Service {
      * Plays or resumes the playback, depending on the current player state.
      */
     public synchronized void togglePlayPause() {
-        if (playerState == PAUSED || playerState == COMPLETED || playerState == STOPPED) {
+        switch (playerState) {
+            case PAUSED:
+            case COMPLETED:
+            case STOPPED:
                 start();
-        } else if (playerState == STOPPED || playerState == IDLE) {
+                break;
+            case IDLE:
                 autoPlayStart = true;
                 play();
-        } else if (playerState == STARTED) {
+                break;
+            case STARTED:
                 pause();
+                break;
         }
     }
 

app/src/main/java/net/nullsum/audinaut/service/DownloadServiceLifecycleSupport.java

@@ -71,19 +71,26 @@ public class DownloadServiceLifecycleSupport {
             eventHandler.post(() -> {
                 String action = intent.getAction();
                 Log.i(TAG, "intentReceiver.onReceive: " + action);
-                if (DownloadService.CMD_PLAY.equals(action)) {
+                switch (action) {
+                    case DownloadService.CMD_PLAY:
                         downloadService.play();
-                } else if (DownloadService.CMD_NEXT.equals(action)) {
+                        break;
+                    case DownloadService.CMD_NEXT:
                         downloadService.next();
-                } else if (DownloadService.CMD_PREVIOUS.equals(action)) {
+                        break;
+                    case DownloadService.CMD_PREVIOUS:
                         downloadService.previous();
-                } else if (DownloadService.CMD_TOGGLEPAUSE.equals(action)) {
+                        break;
+                    case DownloadService.CMD_TOGGLEPAUSE:
                         downloadService.togglePlayPause();
-                } else if (DownloadService.CMD_PAUSE.equals(action)) {
+                        break;
+                    case DownloadService.CMD_PAUSE:
                         downloadService.pause();
-                } else if (DownloadService.CMD_STOP.equals(action)) {
+                        break;
+                    case DownloadService.CMD_STOP:
                         downloadService.pause();
                         downloadService.seekTo(0);
+                        break;
                 }
             });
         }

app/src/main/java/net/nullsum/audinaut/service/parser/EntryListParser.java

@@ -44,17 +44,23 @@ public class EntryListParser extends MusicDirectoryEntryParser {
             eventType = nextParseEvent();
             if (eventType == XmlPullParser.START_TAG) {
                 String name = getElementName();
-                if ("album".equals(name)) {
+                switch (name) {
+                    case "album": {
                         MusicDirectory.Entry entry = parseEntry("");
                         if (get("isDir") == null) {
                             entry.setDirectory(true);
                         }
                         dir.addChild(entry);
-                } else if ("song".equals(name)) {
+                        break;
+                    }
+                    case "song": {
                         MusicDirectory.Entry entry = parseEntry("");
                         dir.addChild(entry);
-                } else if ("error".equals(name)) {
+                        break;
+                    }
+                    case "error":
                         handleError();
+                        break;
                 }
             }
         } while (eventType != XmlPullParser.END_DOCUMENT);

app/src/main/java/net/nullsum/audinaut/service/parser/GenreParser.java

@@ -51,14 +51,18 @@ public class GenreParser extends AbstractParser {
             eventType = nextParseEvent();
             if (eventType == XmlPullParser.START_TAG) {
                 String name = getElementName();
-                if ("genre".equals(name)) {
+                switch (name) {
+                    case "genre":
                         genre = new Genre();
                         genre.setSongCount(getInteger("songCount"));
                         genre.setAlbumCount(getInteger("albumCount"));
-                } else if ("error".equals(name)) {
+                        break;
+                    case "error":
                         handleError();
-                } else {
+                        break;
+                    default:
                         genre = null;
+                        break;
                 }
             } else if (eventType == XmlPullParser.TEXT) {
                 if (genre != null) {

app/src/main/java/net/nullsum/audinaut/service/parser/IndexesParser.java

@@ -65,13 +65,17 @@ public class IndexesParser extends MusicDirectoryEntryParser {
             eventType = nextParseEvent();
             if (eventType == XmlPullParser.START_TAG) {
                 String name = getElementName();
-                if ("indexes".equals(name) || "artists".equals(name)) {
+                switch (name) {
+                    case "indexes":
+                    case "artists":
                         changed = true;
                         ignoredArticles = get("ignoredArticles");
-                } else if ("index".equals(name)) {
+                        break;
+                    case "index":
                         index = get("name");
 
-                } else if ("artist".equals(name)) {
+                        break;
+                    case "artist":
                         Artist artist = new Artist();
                         artist.setId(get("id"));
                         artist.setName(get("name"));
@@ -90,17 +94,21 @@ public class IndexesParser extends MusicDirectoryEntryParser {
                             String msg = getContext().getResources().getString(R.string.parser_artist_count, artists.size());
                             updateProgress(progressListener, msg);
                         }
-                } else if ("shortcut".equals(name)) {
+                        break;
+                    case "shortcut":
                         Artist shortcut = new Artist();
                         shortcut.setId(get("id"));
                         shortcut.setName(get("name"));
                         shortcut.setIndex("*");
                         shortcuts.add(shortcut);
-                } else if ("child".equals(name)) {
+                        break;
+                    case "child":
                         MusicDirectory.Entry entry = parseEntry("");
                         entries.add(entry);
-                } else if ("error".equals(name)) {
+                        break;
+                    case "error":
                         handleError();
+                        break;
                 }
             }
         } while (eventType != XmlPullParser.END_DOCUMENT);

app/src/main/java/net/nullsum/audinaut/service/parser/PlaylistParser.java

@@ -44,13 +44,17 @@ public class PlaylistParser extends MusicDirectoryEntryParser {
             eventType = nextParseEvent();
             if (eventType == XmlPullParser.START_TAG) {
                 String name = getElementName();
-                if ("entry".equals(name)) {
+                switch (name) {
+                    case "entry":
                         dir.addChild(parseEntry(""));
-                } else if ("error".equals(name)) {
+                        break;
+                    case "error":
                         handleError();
-                } else if ("playlist".equals(name)) {
+                        break;
+                    case "playlist":
                         dir.setName(get("name"));
                         dir.setId(get("id"));
+                        break;
                 }
             }
         } while (eventType != XmlPullParser.END_DOCUMENT);

app/src/main/java/net/nullsum/audinaut/service/parser/SearchResult2Parser.java

@@ -50,19 +50,24 @@ public class SearchResult2Parser extends MusicDirectoryEntryParser {
             eventType = nextParseEvent();
             if (eventType == XmlPullParser.START_TAG) {
                 String name = getElementName();
-                if ("artist".equals(name)) {
+                switch (name) {
+                    case "artist":
                         Artist artist = new Artist();
                         artist.setId(get("id"));
                         artist.setName(get("name"));
                         artists.add(artist);
-                } else if ("album".equals(name)) {
+                        break;
+                    case "album":
                         MusicDirectory.Entry entry = parseEntry("");
                         entry.setDirectory(true);
                         albums.add(entry);
-                } else if ("song".equals(name)) {
+                        break;
+                    case "song":
                         songs.add(parseEntry(""));
-                } else if ("error".equals(name)) {
+                        break;
+                    case "error":
                         handleError();
+                        break;
                 }
             }
         } while (eventType != XmlPullParser.END_DOCUMENT);

app/src/main/java/net/nullsum/audinaut/util/ThemeUtil.java

@@ -60,28 +60,31 @@ public final class ThemeUtil {
     private static int getThemeRes(Context context, String theme) {
         if (context instanceof SubsonicFragmentActivity || context instanceof SettingsActivity) {
             if (Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_COLOR_ACTION_BAR, true)) {
-                if (THEME_DARK.equals(theme)) {
+                switch (theme) {
+                    case THEME_DARK:
                         return R.style.Theme_Audinaut_Dark_No_Actionbar;
-                } else if (THEME_BLACK.equals(theme)) {
+                    case THEME_BLACK:
                         return R.style.Theme_Audinaut_Black_No_Actionbar;
-                } else {
+                    default:
                         return R.style.Theme_Audinaut_Light_No_Actionbar;
                 }
             } else {
-                if (THEME_DARK.equals(theme)) {
+                switch (theme) {
+                    case THEME_DARK:
                         return R.style.Theme_Audinaut_Dark_No_Color;
-                } else if (THEME_BLACK.equals(theme)) {
+                    case THEME_BLACK:
                         return R.style.Theme_Audinaut_Black_No_Color;
-                } else {
+                    default:
                         return R.style.Theme_Audinaut_Light_No_Color;
                 }
             }
         } else {
-            if (THEME_DARK.equals(theme)) {
+            switch (theme) {
+                case THEME_DARK:
                     return R.style.Theme_Audinaut_Dark;
-            } else if (THEME_BLACK.equals(theme)) {
+                case THEME_BLACK:
                     return R.style.Theme_Audinaut_Black;
-            } else {
+                default:
                     return R.style.Theme_Audinaut_Light;
             }
         }

app/src/main/java/net/nullsum/audinaut/util/Util.java

@@ -968,7 +968,9 @@ public final class Util {
             audioManager.requestAudioFocus(focusListener = new OnAudioFocusChangeListener() {
                 public void onAudioFocusChange(int focusChange) {
                     DownloadService downloadService = (DownloadService) context;
-                    if ((focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT || focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK)) {
+                    switch (focusChange) {
+                        case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+                        case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
                             if (downloadService.getPlayerState() == PlayerState.STARTED) {
                                 Log.i(TAG, "Temporary loss of focus");
                                 SharedPreferences prefs = getPreferences(context);
@@ -981,7 +983,8 @@ public final class Util {
                                     downloadService.pause(true);
                                 }
                             }
-                    } else if (focusChange == AudioManager.AUDIOFOCUS_GAIN) {
+                            break;
+                        case AudioManager.AUDIOFOCUS_GAIN:
                             if (pauseFocus) {
                                 pauseFocus = false;
                                 downloadService.start();
@@ -990,11 +993,13 @@ public final class Util {
                                 lowerFocus = false;
                                 downloadService.setVolume(1.0f);
                             }
-                    } else if (focusChange == AudioManager.AUDIOFOCUS_LOSS) {
+                            break;
+                        case AudioManager.AUDIOFOCUS_LOSS:
                             Log.i(TAG, "Permanently lost focus");
                             focusListener = null;
                             downloadService.pause();
                             audioManager.abandonAudioFocus(this);
+                            break;
                     }
                 }
             }, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);