Replace switch with if on resources, which will be non-final in gradle 8

10 files changed, 211 insertions, 249 deletions

diff --git a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
index a2c11a4..241f211 100644
--- a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
+++ b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
@@ -417,13 +417,10 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
     public boolean onOptionsItemSelected(MenuItem item) {
         if(mDrawerToggle.onOptionsItemSelected(item))
             return true;
-
-        switch (item.getItemId()) {
-            case R.id.action_disconnect:
-                getService().disconnect();
-                return true;
+        if (item.getItemId() == R.id.action_disconnect) {
+            getService().disconnect();
+            return true;
         }
-
         return false;
     }
 
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java b/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java
index 6003a36..e42a464 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java
@@ -198,10 +198,9 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_clear_chat:
-                clear();
-                return true;
+        if (item.getItemId() == R.id.menu_clear_chat) {
+            clear();
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelFragment.java b/app/src/main/java/se/lublin/mumla/channel/ChannelFragment.java
index 3332dc8..2c31d69 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelFragment.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelFragment.java
@@ -226,16 +226,16 @@ public class ChannelFragment extends HumlaServiceFragment implements SharedPrefe
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         Settings settings = Settings.getInstance(getActivity());
-        switch (item.getItemId()) {
-            case R.id.menu_input_voice:
-                settings.setInputMethod(Settings.ARRAY_INPUT_METHOD_VOICE);
-                return true;
-            case R.id.menu_input_ptt:
-                settings.setInputMethod(Settings.ARRAY_INPUT_METHOD_PTT);
-                return true;
-            case R.id.menu_input_continuous:
-                settings.setInputMethod(Settings.ARRAY_INPUT_METHOD_CONTINUOUS);
-                return true;
+        int itemId = item.getItemId();
+        if (itemId == R.id.menu_input_voice) {
+            settings.setInputMethod(Settings.ARRAY_INPUT_METHOD_VOICE);
+            return true;
+        } else if (itemId == R.id.menu_input_ptt) {
+            settings.setInputMethod(Settings.ARRAY_INPUT_METHOD_PTT);
+            return true;
+        } else if (itemId == R.id.menu_input_continuous) {
+            settings.setInputMethod(Settings.ARRAY_INPUT_METHOD_CONTINUOUS);
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelListFragment.java b/app/src/main/java/se/lublin/mumla/channel/ChannelListFragment.java
index 5ec7ed5..1bdeedf 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelListFragment.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelListFragment.java
@@ -280,37 +280,35 @@ public class ChannelListFragment extends HumlaServiceFragment implements OnChann
             return super.onOptionsItemSelected(item);
 
         IHumlaSession session = getService().HumlaSession();
-        switch (item.getItemId()) {
-            case R.id.menu_mute_button: {
-                IUser self = session.getSessionUser();
-
-                boolean muted = !self.isSelfMuted();
-                boolean deafened = self.isSelfDeafened();
-                deafened &= muted; // Undeafen if mute is off
-                session.setSelfMuteDeafState(muted, deafened);
+        int itemId = item.getItemId();
+        if (itemId == R.id.menu_mute_button) {
+            IUser self = session.getSessionUser();
 
-                getActivity().supportInvalidateOptionsMenu();
-                return true;
-            }
-            case R.id.menu_deafen_button: {
-                IUser self = session.getSessionUser();
+            boolean muted = !self.isSelfMuted();
+            boolean deafened = self.isSelfDeafened();
+            deafened &= muted; // Undeafen if mute is off
+            session.setSelfMuteDeafState(muted, deafened);
 
-                boolean deafened = !self.isSelfDeafened();
-                session.setSelfMuteDeafState(deafened, deafened);
+            getActivity().supportInvalidateOptionsMenu();
+            return true;
+        } else if (itemId == R.id.menu_deafen_button) {
+            IUser self = session.getSessionUser();
 
-                getActivity().supportInvalidateOptionsMenu();
-                return true;
+            boolean deafened = !self.isSelfDeafened();
+            session.setSelfMuteDeafState(deafened, deafened);
+
+            getActivity().supportInvalidateOptionsMenu();
+            return true;
+        } else if (itemId == R.id.menu_search) {
+            return false;
+        } else if (itemId == R.id.menu_bluetooth) {
+            item.setChecked(!item.isChecked());
+            if (item.isChecked()) {
+                session.enableBluetoothSco();
+            } else {
+                session.disableBluetoothSco();
             }
-            case R.id.menu_search:
-                return false;
-            case R.id.menu_bluetooth:
-                item.setChecked(!item.isChecked());
-                if (item.isChecked()) {
-                    session.enableBluetoothSco();
-                } else {
-                    session.disableBluetoothSco();
-                }
-                return true;
+            return true;
         }
 
         return super.onOptionsItemSelected(item);
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelMenu.java b/app/src/main/java/se/lublin/mumla/channel/ChannelMenu.java
index 6fc6695..72d8914 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelMenu.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelMenu.java
@@ -94,118 +94,103 @@ public class ChannelMenu implements PermissionsPopupMenu.IOnMenuPrepareListener,
     }
 
     @Override
-    @SuppressWarnings("fallthrough")
     public boolean onMenuItemClick(MenuItem item) {
         if (!mService.isConnected())
             return false;
 
-        boolean adding = false;
-        switch(item.getItemId()) {
-            case R.id.context_channel_join:
-                mService.HumlaSession().joinChannel(mChannel.getId());
-                break;
-            case R.id.context_channel_add:
-                adding = true;
-                // fallthrough!
-            case R.id.context_channel_edit:
-                ChannelEditFragment addFragment = new ChannelEditFragment();
-                Bundle args = new Bundle();
-                if (adding) {
-                    args.putInt("parent", mChannel.getId());
-                } else {
-                    args.putInt("channel", mChannel.getId());
-                }
-                args.putBoolean("adding", adding);
-                addFragment.setArguments(args);
-                addFragment.show(mFragmentManager, "ChannelAdd");
-                break;
-            case R.id.context_channel_remove:
-                AlertDialog.Builder adb = new AlertDialog.Builder(mContext);
-                adb.setTitle(R.string.confirm);
-                adb.setMessage(R.string.confirm_delete_channel);
-                adb.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (mService.isConnected()) {
-                            mService.HumlaSession().removeChannel(mChannel.getId());
-                        }
+        int itemId = item.getItemId();
+        if (itemId == R.id.context_channel_join) {
+            mService.HumlaSession().joinChannel(mChannel.getId());
+        } else if (itemId == R.id.context_channel_add || itemId == R.id.context_channel_edit) {
+            Bundle args = new Bundle();
+            if (itemId == R.id.context_channel_add) {
+                args.putInt("parent", mChannel.getId());
+                args.putBoolean("adding", true);
+            } else {
+                args.putInt("channel", mChannel.getId());
+                args.putBoolean("adding", false);
+            }
+            ChannelEditFragment addFragment = new ChannelEditFragment();
+            addFragment.setArguments(args);
+            addFragment.show(mFragmentManager, "ChannelAdd");
+        } else if (itemId == R.id.context_channel_remove) {
+            AlertDialog.Builder adb = new AlertDialog.Builder(mContext);
+            adb.setTitle(R.string.confirm);
+            adb.setMessage(R.string.confirm_delete_channel);
+            adb.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    if (mService.isConnected()) {
+                        mService.HumlaSession().removeChannel(mChannel.getId());
                     }
-                });
-                adb.setNegativeButton(android.R.string.cancel, null);
-                adb.show();
-                break;
-            case R.id.context_channel_view_description:
-                Bundle commentArgs = new Bundle();
-                commentArgs.putInt("channel", mChannel.getId());
-                commentArgs.putString("comment", mChannel.getDescription());
-                commentArgs.putBoolean("editing", false);
-                DialogFragment commentFragment = (DialogFragment) Fragment.instantiate(mContext,
-                        ChannelDescriptionFragment.class.getName(), commentArgs);
-                commentFragment.show(mFragmentManager, ChannelDescriptionFragment.class.getName());
-                break;
-            case R.id.context_channel_pin:
-                long serverId = mService.getTargetServer().getId();
-                boolean pinned = mDatabase.isChannelPinned(serverId, mChannel.getId());
-                if(!pinned) mDatabase.addPinnedChannel(serverId, mChannel.getId());
-                else mDatabase.removePinnedChannel(serverId, mChannel.getId());
-                break;
-            case R.id.context_channel_link: {
-                IChannel channel = mService.HumlaSession().getSessionChannel();
-                if (!item.isChecked()) {
-                    mService.HumlaSession().linkChannels(channel, mChannel);
-                } else {
-                    mService.HumlaSession().unlinkChannels(channel, mChannel);
                 }
-                break;
+            });
+            adb.setNegativeButton(android.R.string.cancel, null);
+            adb.show();
+        } else if (itemId == R.id.context_channel_view_description) {
+            Bundle commentArgs = new Bundle();
+            commentArgs.putInt("channel", mChannel.getId());
+            commentArgs.putString("comment", mChannel.getDescription());
+            commentArgs.putBoolean("editing", false);
+            DialogFragment commentFragment = (DialogFragment) Fragment.instantiate(mContext,
+                    ChannelDescriptionFragment.class.getName(), commentArgs);
+            commentFragment.show(mFragmentManager, ChannelDescriptionFragment.class.getName());
+        } else if (itemId == R.id.context_channel_pin) {
+            long serverId = mService.getTargetServer().getId();
+            boolean pinned = mDatabase.isChannelPinned(serverId, mChannel.getId());
+            if (!pinned) mDatabase.addPinnedChannel(serverId, mChannel.getId());
+            else mDatabase.removePinnedChannel(serverId, mChannel.getId());
+        } else if (itemId == R.id.context_channel_link) {
+            IChannel channel = mService.HumlaSession().getSessionChannel();
+            if (!item.isChecked()) {
+                mService.HumlaSession().linkChannels(channel, mChannel);
+            } else {
+                mService.HumlaSession().unlinkChannels(channel, mChannel);
             }
-            case R.id.context_channel_unlink_all:
-                mService.HumlaSession().unlinkAllChannels(mChannel);
-                break;
-            case R.id.context_channel_shout: {
-                AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-                builder.setTitle(R.string.shout_configure);
-                LinearLayout layout = new LinearLayout(mContext);
-                layout.setOrientation(LinearLayout.VERTICAL);
-
-                final CheckBox subchannelBox = new CheckBox(mContext);
-                subchannelBox.setText(R.string.shout_include_subchannels);
-                layout.addView(subchannelBox);
-
-                final CheckBox linkedBox = new CheckBox(mContext);
-                linkedBox.setText(R.string.shout_include_linked);
-                layout.addView(linkedBox);
-
-                builder.setView(layout);
-                builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (!mService.isConnected())
-                            return;
-
-                        IHumlaSession session = mService.HumlaSession();
-
-                        // Unregister any existing voice target.
-                        if (session.getVoiceTargetMode() == VoiceTargetMode.WHISPER) {
-                            session.unregisterWhisperTarget(session.getVoiceTargetId());
-                        }
-
-                        WhisperTargetChannel channelTarget = new WhisperTargetChannel(mChannel,
-                                linkedBox.isChecked(), subchannelBox.isChecked(), null);
-                        byte id = session.registerWhisperTarget(channelTarget);
-                        if (id > 0) {
-                            session.setVoiceTargetId(id);
-                        } else {
-                            Toast.makeText(mContext, R.string.shout_failed, Toast.LENGTH_LONG).show();
-                        }
+        } else if (itemId == R.id.context_channel_unlink_all) {
+            mService.HumlaSession().unlinkAllChannels(mChannel);
+        } else if (itemId == R.id.context_channel_shout) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
+            builder.setTitle(R.string.shout_configure);
+            LinearLayout layout = new LinearLayout(mContext);
+            layout.setOrientation(LinearLayout.VERTICAL);
+
+            final CheckBox subchannelBox = new CheckBox(mContext);
+            subchannelBox.setText(R.string.shout_include_subchannels);
+            layout.addView(subchannelBox);
+
+            final CheckBox linkedBox = new CheckBox(mContext);
+            linkedBox.setText(R.string.shout_include_linked);
+            layout.addView(linkedBox);
+
+            builder.setView(layout);
+            builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    if (!mService.isConnected())
+                        return;
+
+                    IHumlaSession session = mService.HumlaSession();
+
+                    // Unregister any existing voice target.
+                    if (session.getVoiceTargetMode() == VoiceTargetMode.WHISPER) {
+                        session.unregisterWhisperTarget(session.getVoiceTargetId());
                     }
-                });
-                builder.setNegativeButton(android.R.string.cancel, null);
-                builder.show();
 
-                break;
-            }
-            default:
-                return false;
+                    WhisperTargetChannel channelTarget = new WhisperTargetChannel(mChannel,
+                            linkedBox.isChecked(), subchannelBox.isChecked(), null);
+                    byte id = session.registerWhisperTarget(channelTarget);
+                    if (id > 0) {
+                        session.setVoiceTargetId(id);
+                    } else {
+                        Toast.makeText(mContext, R.string.shout_failed, Toast.LENGTH_LONG).show();
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+            builder.show();
+        } else {
+            return false;
         }
         return true;
     }
diff --git a/app/src/main/java/se/lublin/mumla/channel/UserMenu.java b/app/src/main/java/se/lublin/mumla/channel/UserMenu.java
index 9c702e1..ca2c87a 100644
--- a/app/src/main/java/se/lublin/mumla/channel/UserMenu.java
+++ b/app/src/main/java/se/lublin/mumla/channel/UserMenu.java
@@ -116,69 +116,56 @@ public class UserMenu implements PermissionsPopupMenu.IOnMenuPrepareListener, Po
 
     @Override
     public boolean onMenuItemClick(final MenuItem menuItem) {
-        switch (menuItem.getItemId()) {
-            case R.id.context_ban:
-            case R.id.context_kick:
-                AlertDialog.Builder alertBuilder = new AlertDialog.Builder(mContext);
-                alertBuilder.setTitle(R.string.user_menu_kick);
-                final EditText reasonField = new EditText(mContext);
-                reasonField.setHint(R.string.hint_reason);
-                alertBuilder.setView(reasonField);
-                alertBuilder.setPositiveButton(R.string.user_menu_kick, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        mService.kickBanUser(mUser.getSession(),
-                                reasonField.getText().toString(), menuItem.getItemId() == R.id.context_ban);
-                    }
-                });
-                alertBuilder.setNegativeButton(android.R.string.cancel, null);
-                alertBuilder.show();
-                break;
-            case R.id.context_mute:
-                mService.setMuteDeafState(mUser.getSession(), !(mUser.isMuted() || mUser.isSuppressed()), mUser.isDeafened());
-                break;
-            case R.id.context_deafen:
-                mService.setMuteDeafState(mUser.getSession(), mUser.isMuted(), !mUser.isDeafened());
-                break;
-            case R.id.context_move:
-                showChannelMoveDialog();
-                break;
-            case R.id.context_priority:
-                mService.setPrioritySpeaker(mUser.getSession(), !mUser.isPrioritySpeaker());
-                break;
-            case R.id.context_local_mute:
-                mUser.setLocalMuted(!mUser.isLocalMuted());
-                mStateListener.onLocalUserStateUpdated(mUser);
-                break;
-            case R.id.context_ignore_messages:
-                mUser.setLocalIgnored(!mUser.isLocalIgnored());
-                mStateListener.onLocalUserStateUpdated(mUser);
-                break;
-            case R.id.context_change_comment:
-                showUserComment(true);
-                break;
-            case R.id.context_view_comment:
-                showUserComment(false);
-                break;
-            case R.id.context_reset_comment:
-                new AlertDialog.Builder(mContext)
-                        .setMessage(mContext.getString(R.string.confirm_reset_comment, mUser.getName()))
-                        .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                mService.setUserComment(mUser.getSession(), "");
-                            }
-                        })
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .show();
-                break;
-//                case R.id.context_info:
-//                    break;
-            case R.id.context_register:
-                mService.registerUser(mUser.getSession());
-                break;
-            default:
-                return false;
+        int itemId = menuItem.getItemId();
+        if (itemId == R.id.context_ban || itemId == R.id.context_kick) {
+            AlertDialog.Builder alertBuilder = new AlertDialog.Builder(mContext);
+            alertBuilder.setTitle(R.string.user_menu_kick);
+            final EditText reasonField = new EditText(mContext);
+            reasonField.setHint(R.string.hint_reason);
+            alertBuilder.setView(reasonField);
+            alertBuilder.setPositiveButton(R.string.user_menu_kick, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    mService.kickBanUser(mUser.getSession(),
+                            reasonField.getText().toString(), menuItem.getItemId() == R.id.context_ban);
+                }
+            });
+            alertBuilder.setNegativeButton(android.R.string.cancel, null);
+            alertBuilder.show();
+        } else if (itemId == R.id.context_mute) {
+            mService.setMuteDeafState(mUser.getSession(), !(mUser.isMuted() || mUser.isSuppressed()), mUser.isDeafened());
+        } else if (itemId == R.id.context_deafen) {
+            mService.setMuteDeafState(mUser.getSession(), mUser.isMuted(), !mUser.isDeafened());
+        } else if (itemId == R.id.context_move) {
+            showChannelMoveDialog();
+        } else if (itemId == R.id.context_priority) {
+            mService.setPrioritySpeaker(mUser.getSession(), !mUser.isPrioritySpeaker());
+        } else if (itemId == R.id.context_local_mute) {
+            mUser.setLocalMuted(!mUser.isLocalMuted());
+            mStateListener.onLocalUserStateUpdated(mUser);
+        } else if (itemId == R.id.context_ignore_messages) {
+            mUser.setLocalIgnored(!mUser.isLocalIgnored());
+            mStateListener.onLocalUserStateUpdated(mUser);
+        } else if (itemId == R.id.context_change_comment) {
+            showUserComment(true);
+        } else if (itemId == R.id.context_view_comment) {
+            showUserComment(false);
+        } else if (itemId == R.id.context_reset_comment) {
+            new AlertDialog.Builder(mContext)
+                    .setMessage(mContext.getString(R.string.confirm_reset_comment, mUser.getName()))
+                    .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            mService.setUserComment(mUser.getSession(), "");
+                        }
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show();
+//        } else if (itemId == R.id.context_info) {
+        } else if (itemId == R.id.context_register) {
+            mService.registerUser(mUser.getSession());
+        } else {
+            return false;
         }
         return true;
     }
diff --git a/app/src/main/java/se/lublin/mumla/servers/FavouriteServerAdapter.java b/app/src/main/java/se/lublin/mumla/servers/FavouriteServerAdapter.java
index ce06707..3660cf3 100644
--- a/app/src/main/java/se/lublin/mumla/servers/FavouriteServerAdapter.java
+++ b/app/src/main/java/se/lublin/mumla/servers/FavouriteServerAdapter.java
@@ -44,19 +44,18 @@ public class FavouriteServerAdapter extends ServerAdapter<Server> {
 
     @Override
     public boolean onPopupItemClick(Server server, MenuItem menuItem) {
-        switch (menuItem.getItemId()) {
-            case R.id.menu_server_edit:
-                mListener.editServer(server);
-                return true;
-            case R.id.menu_server_share:
-                mListener.shareServer(server);
-                return true;
-            case R.id.menu_server_delete:
-                mListener.deleteServer(server);
-                return true;
-            default:
-                return false;
+        int itemId = menuItem.getItemId();
+        if (itemId == R.id.menu_server_edit) {
+            mListener.editServer(server);
+            return true;
+        } else if (itemId == R.id.menu_server_share) {
+            mListener.shareServer(server);
+            return true;
+        } else if (itemId == R.id.menu_server_delete) {
+            mListener.deleteServer(server);
+            return true;
         }
+        return false;
     }
 
     public static interface FavouriteServerAdapterMenuListener {
diff --git a/app/src/main/java/se/lublin/mumla/servers/FavouriteServerListFragment.java b/app/src/main/java/se/lublin/mumla/servers/FavouriteServerListFragment.java
index 19916ff..a89b81c 100644
--- a/app/src/main/java/se/lublin/mumla/servers/FavouriteServerListFragment.java
+++ b/app/src/main/java/se/lublin/mumla/servers/FavouriteServerListFragment.java
@@ -97,14 +97,14 @@ public class FavouriteServerListFragment extends Fragment implements OnItemClick
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_add_server_item:
-                addServer();
-                return true;
-            case R.id.menu_quick_connect:
-                ServerEditFragment.createServerEditDialog(getActivity(), null, ServerEditFragment.Action.CONNECT_ACTION, true)
-                        .show(getFragmentManager(), "serverInfo");
-                return true;
+        int itemId = item.getItemId();
+        if (itemId == R.id.menu_add_server_item) {
+            addServer();
+            return true;
+        } else if (itemId == R.id.menu_quick_connect) {
+            ServerEditFragment.createServerEditDialog(getActivity(), null, ServerEditFragment.Action.CONNECT_ACTION, true)
+                    .show(getFragmentManager(), "serverInfo");
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/app/src/main/java/se/lublin/mumla/servers/PublicServerAdapter.java b/app/src/main/java/se/lublin/mumla/servers/PublicServerAdapter.java
index cf3ac1c..25a7bc2 100644
--- a/app/src/main/java/se/lublin/mumla/servers/PublicServerAdapter.java
+++ b/app/src/main/java/se/lublin/mumla/servers/PublicServerAdapter.java
@@ -75,13 +75,11 @@ public class PublicServerAdapter extends ServerAdapter<PublicServer> {
 
     @Override
     public boolean onPopupItemClick(Server server, MenuItem menuItem) {
-        switch (menuItem.getItemId()) {
-            case R.id.menu_server_favourite:
-                mListener.favouriteServer(server);
-                return true;
-            default:
-                return false;
+        if (menuItem.getItemId() == R.id.menu_server_favourite) {
+            mListener.favouriteServer(server);
+            return true;
         }
+        return false;
     }
 
     public static interface PublicServerAdapterMenuListener {
diff --git a/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java b/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
index 8414a00..24b6c1e 100644
--- a/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
+++ b/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
@@ -133,16 +133,15 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (isFilled()) {
-            switch(item.getItemId()) {
-                case R.id.menu_match_server:
-                    showMatchDialog();
-                    break;
-                case R.id.menu_sort_server_item:
-                    showSortDialog();
-                    return true;
-                case R.id.menu_search_server_item:
-                    showFilterDialog();
-                    return true;
+            int itemId = item.getItemId();
+            if (itemId == R.id.menu_match_server) {
+                showMatchDialog();
+            } else if (itemId == R.id.menu_sort_server_item) {
+                showSortDialog();
+                return true;
+            } else if (itemId == R.id.menu_search_server_item) {
+                showFilterDialog();
+                return true;
             }
         }
         return super.onOptionsItemSelected(item);