fix warning about non-final resource IDs

gradle.properties

@@ -1,6 +1,5 @@
 android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
-android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx4608m

src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java

@@ -410,14 +410,28 @@ public abstract class BaseConversationListFragment extends Fragment implements A
 
   @Override
   public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-    case R.id.menu_select_all:       handleSelectAllThreads();   return true;
+    if (itemId == R.id.menu_select_all) {
-    case R.id.menu_delete_selected:  handleDeleteAllSelected();  return true;
+      handleSelectAllThreads();
-    case R.id.menu_pin_selected:     handlePinAllSelected();     return true;
+      return true;
-    case R.id.menu_archive_selected: handleArchiveAllSelected(); return true;
+    } else if (itemId == R.id.menu_delete_selected) {
-    case R.id.menu_mute_selected:    handleMuteAllSelected();    return true;
+      handleDeleteAllSelected();
-    case R.id.menu_marknoticed_selected: handleMarknoticedSelected(); return true;
+      return true;
-    case R.id.menu_add_to_home_screen:  handleAddToHomeScreen(); return true;
+    } else if (itemId == R.id.menu_pin_selected) {
+      handlePinAllSelected();
+      return true;
+    } else if (itemId == R.id.menu_archive_selected) {
+      handleArchiveAllSelected();
+      return true;
+    } else if (itemId == R.id.menu_mute_selected) {
+      handleMuteAllSelected();
+      return true;
+    } else if (itemId == R.id.menu_marknoticed_selected) {
+      handleMarknoticedSelected();
+      return true;
+    } else if (itemId == R.id.menu_add_to_home_screen) {
+      handleAddToHomeScreen();
+      return true;
     }
 
     return false;

src/main/java/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java

@@ -57,8 +57,7 @@ public class ContactMultiSelectionActivity extends ContactSelectionActivity {
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
+    if (item.getItemId() == R.id.menu_add_members) {
-      case R.id.menu_add_members:
       saveSelection();
       finish();
       return true;

src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java

@@ -149,14 +149,14 @@ public class ContactSelectionListFragment extends    Fragment
 
       @Override
       public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
-        switch (menuItem.getItemId()) {
+        int itemId = menuItem.getItemId();
-          case R.id.menu_select_all:
+        if (itemId == R.id.menu_select_all) {
           handleSelectAll();
           return true;
-          case R.id.menu_view_profile:
+        } else if (itemId == R.id.menu_view_profile) {
           handleViewProfile();
           return true;
-          case R.id.menu_delete_selected:
+        } else if (itemId == R.id.menu_delete_selected) {
           handleDeleteSelected();
           return true;
         }

src/main/java/org/thoughtcrime/securesms/ConversationActivity.java

@@ -503,18 +503,40 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case R.id.menu_add_attachment:        handleAddAttachment();             return true;
+    if (itemId == R.id.menu_add_attachment) {
-      case R.id.menu_leave:                 handleLeaveGroup();                return true;
+      handleAddAttachment();
-      case R.id.menu_archive_chat:          handleArchiveChat();               return true;
+      return true;
-      case R.id.menu_clear_chat:            fragment.handleClearChat();        return true;
+    } else if (itemId == R.id.menu_leave) {
-      case R.id.menu_delete_chat:           handleDeleteChat();                return true;
+      handleLeaveGroup();
-      case R.id.menu_mute_notifications:    handleMuteNotifications();         return true;
+      return true;
-      case R.id.menu_show_map:              WebxdcActivity.openMaps(this, chatId); return true;
+    } else if (itemId == R.id.menu_archive_chat) {
-      case R.id.menu_search_up:             handleMenuSearchNext(false);       return true;
+      handleArchiveChat();
-      case R.id.menu_search_down:           handleMenuSearchNext(true);        return true;
+      return true;
-      case android.R.id.home:               handleReturnToConversationList();  return true;
+    } else if (itemId == R.id.menu_clear_chat) {
-      case R.id.menu_ephemeral_messages:    handleEphemeralMessages();         return true;
+      fragment.handleClearChat();
+      return true;
+    } else if (itemId == R.id.menu_delete_chat) {
+      handleDeleteChat();
+      return true;
+    } else if (itemId == R.id.menu_mute_notifications) {
+      handleMuteNotifications();
+      return true;
+    } else if (itemId == R.id.menu_show_map) {
+      WebxdcActivity.openMaps(this, chatId);
+      return true;
+    } else if (itemId == R.id.menu_search_up) {
+      handleMenuSearchNext(false);
+      return true;
+    } else if (itemId == R.id.menu_search_down) {
+      handleMenuSearchNext(true);
+      return true;
+    } else if (itemId == android.R.id.home) {
+      handleReturnToConversationList();
+      return true;
+    } else if (itemId == R.id.menu_ephemeral_messages) {
+      handleEphemeralMessages();
+      return true;
     }
 
     return false;

src/main/java/org/thoughtcrime/securesms/ConversationFragment.java

@@ -928,40 +928,40 @@ public class ConversationFragment extends MessageSelectorFragment
         @Override
         public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
             hideAddReactionView();
-            switch(item.getItemId()) {
+          int itemId = item.getItemId();
-                case R.id.menu_context_copy:
+          if (itemId == R.id.menu_context_copy) {
             handleCopyMessage(getListAdapter().getSelectedItems());
             actionMode.finish();
             return true;
-                case R.id.menu_context_delete_message:
+          } else if (itemId == R.id.menu_context_delete_message) {
             handleDeleteMessages((int) chatId, getListAdapter().getSelectedItems());
             return true;
-                case R.id.menu_context_share:
+          } else if (itemId == R.id.menu_context_share) {
             DcHelper.openForViewOrShare(getContext(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId(), Intent.ACTION_SEND);
             return true;
-                case R.id.menu_context_details:
+          } else if (itemId == R.id.menu_context_details) {
             handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
             actionMode.finish();
             return true;
-                case R.id.menu_context_forward:
+          } else if (itemId == R.id.menu_context_forward) {
             handleForwardMessage(getListAdapter().getSelectedItems());
             actionMode.finish();
             return true;
-                case R.id.menu_add_to_home_screen:
+          } else if (itemId == R.id.menu_add_to_home_screen) {
             WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedItems()).getId());
             actionMode.finish();
             return true;
-                case R.id.menu_context_save_attachment:
+          } else if (itemId == R.id.menu_context_save_attachment) {
             handleSaveAttachment(getListAdapter().getSelectedItems());
             return true;
-                case R.id.menu_context_reply:
+          } else if (itemId == R.id.menu_context_reply) {
             handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
             actionMode.finish();
             return true;
-                case R.id.menu_context_reply_privately:
+          } else if (itemId == R.id.menu_context_reply_privately) {
             handleReplyMessagePrivately(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
             return true;
-                case R.id.menu_resend:
+          } else if (itemId == R.id.menu_resend) {
             handleResendMessage(getListAdapter().getSelectedItems());
             return true;
           }

src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -421,29 +421,29 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
 
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case R.id.menu_new_chat:
+    if (itemId == R.id.menu_new_chat) {
       createChat();
       return true;
-      case R.id.menu_invite_friends:
+    } else if (itemId == R.id.menu_invite_friends) {
       shareInvite();
       return true;
-      case R.id.menu_settings:
+    } else if (itemId == R.id.menu_settings) {
       startActivity(new Intent(this, ApplicationPreferencesActivity.class));
       return true;
-      case R.id.menu_qr:
+    } else if (itemId == R.id.menu_qr) {
       new IntentIntegrator(this).setCaptureActivity(QrActivity.class).initiateScan();
       return true;
-      case R.id.menu_global_map:
+    } else if (itemId == R.id.menu_global_map) {
       WebxdcActivity.openMaps(this, 0);
       return true;
-      case R.id.menu_proxy_settings:
+    } else if (itemId == R.id.menu_proxy_settings) {
       startActivity(new Intent(this, ProxySettingsActivity.class));
       return true;
-      case android.R.id.home:
+    } else if (itemId == android.R.id.home) {
       onBackPressed();
       return true;
-      case R.id.menu_all_media:
+    } else if (itemId == R.id.menu_all_media) {
       startActivity(new Intent(this, ProfileActivity.class));
       return true;
     }

src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java

@@ -60,12 +60,11 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
 
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case android.R.id.home:
+    if (itemId == android.R.id.home) {
       onBackPressed();
       return true;
-
+    } else if (itemId == R.id.mark_as_read) {
-      case R.id.mark_as_read:
       DcHelper.getContext(this).marknoticedChat(DcChat.DC_CHAT_ID_ARCHIVED_LINK);
       return true;
     }

src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java

@@ -97,13 +97,12 @@ public class CreateProfileActivity extends BaseActionBarActivity {
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case android.R.id.home:
+    if (itemId == android.R.id.home) {
       onBackPressed();
       return true;
-      case R.id.menu_create_profile:
+    } else if (itemId == R.id.menu_create_profile) {
       updateProfile();
-        break;
     }
 
     return false;

src/main/java/org/thoughtcrime/securesms/FullMsgActivity.java

@@ -116,8 +116,7 @@ public class FullMsgActivity extends WebViewActivity
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
+    if (item.getItemId() == R.id.load_remote_content) {
-      case R.id.load_remote_content:
       AlertDialog.Builder builder = new AlertDialog.Builder(this)
         .setTitle(R.string.load_remote_content)
         .setMessage(R.string.load_remote_content_ask);

src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java

@@ -207,11 +207,11 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   @Override
   public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case android.R.id.home:
+    if (itemId == android.R.id.home) {
       finish();
       return true;
-      case R.id.menu_create_group:
+    } else if (itemId == R.id.menu_create_group) {
       String groupName = getGroupName();
       if (showGroupNameEmptyToast(groupName)) return true;
 

src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java

@@ -156,14 +156,14 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
   public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     super.onOptionsItemSelected(item);
 
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-    case android.R.id.home:
+    if (itemId == android.R.id.home) {
       getOnBackPressedDispatcher().onBackPressed();
       return true;
-    case R.id.menu_proxy_settings:
+    } else if (itemId == R.id.menu_proxy_settings) {
       startActivity(new Intent(this, ProxySettingsActivity.class));
       return true;
-    case R.id.menu_view_log:
+    } else if (itemId == R.id.menu_view_log) {
       startActivity(new Intent(this, LogViewActivity.class));
       return true;
     }

src/main/java/org/thoughtcrime/securesms/LocalHelpActivity.java

@@ -57,20 +57,20 @@ public class LocalHelpActivity extends WebViewActivity
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case R.id.log_scroll_up:
+    if (itemId == R.id.log_scroll_up) {
       webView.scrollTo(0, 0);
       return true;
-      case R.id.learn_more:
+    } else if (itemId == R.id.learn_more) {
       openOnlineUrl("https://delta.chat");
       return true;
-      case R.id.privacy_policy:
+    } else if (itemId == R.id.privacy_policy) {
       openOnlineUrl("https://delta.chat/gdpr");
       return true;
-      case R.id.contribute:
+    } else if (itemId == R.id.contribute) {
       openOnlineUrl("https://delta.chat/contribute");
       return true;
-      case R.id.report_issue:
+    } else if (itemId == R.id.report_issue) {
       openOnlineUrl("https://github.com/deltachat/deltachat-android/issues");
       return true;
     }

src/main/java/org/thoughtcrime/securesms/LogViewActivity.java

@@ -54,11 +54,11 @@ public class LogViewActivity extends BaseActionBarActivity {
     super.onOptionsItemSelected(item);
     Float newSize;
 
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case android.R.id.home:
+    if (itemId == android.R.id.home) {
       finish();
       return true;
-      case R.id.save_log:
+    } else if (itemId == R.id.save_log) {
       Permissions.with(this)
         .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
         .alwaysGrantOnSdk30()
@@ -73,21 +73,21 @@ public class LogViewActivity extends BaseActionBarActivity {
         })
         .execute();
       return true;
-      case R.id.share_log:
+    } else if (itemId == R.id.share_log) {
       shareLog();
       return true;
-      case R.id.log_zoom_in:
+    } else if (itemId == R.id.log_zoom_in) {
       newSize = logViewFragment.getLogTextSize() + 2.0f;
       logViewFragment.setLogTextSize(newSize);
       return false;
-      case R.id.log_zoom_out:
+    } else if (itemId == R.id.log_zoom_out) {
       newSize = logViewFragment.getLogTextSize() - 2.0f;
       logViewFragment.setLogTextSize(newSize);
       return false;
-      case R.id.log_scroll_down:
+    } else if (itemId == R.id.log_scroll_down) {
       logViewFragment.scrollDownLog();
       return false;
-      case R.id.log_scroll_up:
+    } else if (itemId == R.id.log_scroll_up) {
       logViewFragment.scrollUpLog();
       return false;
     }

src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -390,14 +390,28 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
 
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case R.id.media_preview__edit:     editAvatar();   return true;
+    if (itemId == R.id.media_preview__edit) {
-      case R.id.media_preview__overview: showOverview(); return true;
+      editAvatar();
-      case R.id.media_preview__share:    share();        return true;
+      return true;
-      case R.id.save:                    saveToDisk();   return true;
+    } else if (itemId == R.id.media_preview__overview) {
-      case R.id.delete:                  deleteMedia();  return true;
+      showOverview();
-      case R.id.show_in_chat:            showInChat();   return true;
+      return true;
-      case android.R.id.home:            finish();       return true;
+    } else if (itemId == R.id.media_preview__share) {
+      share();
+      return true;
+    } else if (itemId == R.id.save) {
+      saveToDisk();
+      return true;
+    } else if (itemId == R.id.delete) {
+      deleteMedia();
+      return true;
+    } else if (itemId == R.id.show_in_chat) {
+      showInChat();
+      return true;
+    } else if (itemId == android.R.id.home) {
+      finish();
+      return true;
     }
 
     return false;

src/main/java/org/thoughtcrime/securesms/ProfileActivity.java

@@ -416,35 +416,27 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
 
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case android.R.id.home:
+    if (itemId == android.R.id.home) {
       backPressed = true;
       finish();
       return true;
-      case R.id.menu_mute_notifications:
+    } else if (itemId == R.id.menu_mute_notifications) {
       onNotifyOnOff();
-        break;
+    } else if (itemId == R.id.menu_sound) {
-      case R.id.menu_sound:
       onSoundSettings();
-        break;
+    } else if (itemId == R.id.menu_vibrate) {
-      case R.id.menu_vibrate:
       onVibrateSettings();
-        break;
+    } else if (itemId == R.id.edit_name) {
-      case R.id.edit_name:
       onEditName();
-        break;
+    } else if (itemId == R.id.share) {
-      case R.id.share:
       onShare();
-        break;
+    } else if (itemId == R.id.show_encr_info) {
-      case R.id.show_encr_info:
       onEncrInfo();
-        break;
+    } else if (itemId == R.id.block_contact) {
-      case R.id.block_contact:
       onBlockContact();
-        break;
+    } else if (itemId == R.id.menu_clone) {
-      case R.id.menu_clone:
       onClone();
-        break;
     }
 
     return false;
@@ -453,10 +445,8 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
   @Override
   public boolean onContextItemSelected(MenuItem item) {
     super.onContextItemSelected(item);
-    switch (item.getItemId()) {
+    if (item.getItemId() == R.id.copy_addr_to_clipboard) {
-      case R.id.copy_addr_to_clipboard:
       onCopyAddrToClipboard();
-        break;
     }
     return false;
   }

src/main/java/org/thoughtcrime/securesms/ProfileDocumentsFragment.java

@@ -248,32 +248,32 @@ public class ProfileDocumentsFragment
 
     @Override
     public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
-      switch (menuItem.getItemId()) {
+      int itemId = menuItem.getItemId();
-        case R.id.details:
+      if (itemId == R.id.details) {
         handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
         mode.finish();
         return true;
-        case R.id.delete:
+      } else if (itemId == R.id.delete) {
         handleDeleteMessages(chatId, getListAdapter().getSelectedMedia());
         mode.finish();
         return true;
-        case R.id.share:
+      } else if (itemId == R.id.share) {
         handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
         return true;
-        case R.id.menu_add_to_home_screen:
+      } else if (itemId == R.id.menu_add_to_home_screen) {
         WebxdcActivity.addToHomeScreen(getActivity(), getSelectedMessageRecord(getListAdapter().getSelectedMedia()).getId());
         mode.finish();
         return true;
-        case R.id.show_in_chat:
+      } else if (itemId == R.id.show_in_chat) {
         handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
         return true;
-        case R.id.save:
+      } else if (itemId == R.id.save) {
         handleSaveAttachment(getListAdapter().getSelectedMedia());
         return true;
-        case R.id.menu_resend:
+      } else if (itemId == R.id.menu_resend) {
         handleResendMessage(getListAdapter().getSelectedMedia());
         return true;
-        case R.id.menu_select_all:
+      } else if (itemId == R.id.menu_select_all) {
         getListAdapter().selectAll();
         updateActionModeBar();
         return true;

src/main/java/org/thoughtcrime/securesms/ProfileGalleryFragment.java

@@ -233,28 +233,28 @@ public class ProfileGalleryFragment
 
     @Override
     public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
-      switch (menuItem.getItemId()) {
+      int itemId = menuItem.getItemId();
-        case R.id.details:
+      if (itemId == R.id.details) {
         handleDisplayDetails(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
         mode.finish();
         return true;
-        case R.id.delete:
+      } else if (itemId == R.id.delete) {
         handleDeleteMessages(chatId, getListAdapter().getSelectedMedia());
         mode.finish();
         return true;
-        case R.id.share:
+      } else if (itemId == R.id.share) {
         handleShare(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
         return true;
-        case R.id.show_in_chat:
+      } else if (itemId == R.id.show_in_chat) {
         handleShowInChat(getSelectedMessageRecord(getListAdapter().getSelectedMedia()));
         return true;
-        case R.id.save:
+      } else if (itemId == R.id.save) {
         handleSaveAttachment(getListAdapter().getSelectedMedia());
         return true;
-        case R.id.menu_resend:
+      } else if (itemId == R.id.menu_resend) {
         handleResendMessage(getListAdapter().getSelectedMedia());
         return true;
-        case R.id.menu_select_all:
+      } else if (itemId == R.id.menu_select_all) {
         getListAdapter().selectAll();
         updateActionModeBar();
         return true;

src/main/java/org/thoughtcrime/securesms/ProfileSettingsFragment.java

@@ -281,8 +281,7 @@ public class ProfileSettingsFragment extends Fragment
 
     @Override
     public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
-      switch (menuItem.getItemId()) {
+      if (menuItem.getItemId() == R.id.delete) {
-        case R.id.delete:
         final Collection<Integer> toDelIds = adapter.getSelectedMembers();
         StringBuilder readableToDelList = new StringBuilder();
         for (Integer toDelId : toDelIds) {

src/main/java/org/thoughtcrime/securesms/WebViewActivity.java

@@ -254,18 +254,18 @@ public class WebViewActivity extends PassphraseRequiredActionBarActivity
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case android.R.id.home:
+    if (itemId == android.R.id.home) {
       finish();
       return true;
-      case R.id.menu_search_up:
+    } else if (itemId == R.id.menu_search_up) {
       if (lastQuery.isEmpty()) {
         webView.scrollTo(0, 0);
       } else {
         webView.findNext(false);
       }
       return true;
-      case R.id.menu_search_down:
+    } else if (itemId == R.id.menu_search_down) {
       if (lastQuery.isEmpty()) {
         webView.scrollTo(0, 1000000000);
       } else {

src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java

@@ -285,14 +285,14 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case R.id.menu_add_to_home_screen:
+    if (itemId == R.id.menu_add_to_home_screen) {
       addToHomeScreen(this, dcAppMsg.getId());
       return true;
-      case R.id.source_code:
+    } else if (itemId == R.id.source_code) {
       IntentUtils.showInBrowser(this, sourceCodeUrl);
       return true;
-      case R.id.show_in_chat:
+    } else if (itemId == R.id.show_in_chat) {
       showInChat();
       return true;
     }

src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java

@@ -108,16 +108,13 @@ public class AccountSelectionListFragment extends DialogFragment
   }
 
   private void onContextItemSelected(MenuItem item, int accountId) {
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-    case R.id.delete:
+    if (itemId == R.id.delete) {
       onDeleteAccount(accountId);
-      break;
+    } else if (itemId == R.id.menu_mute_notifications) {
-    case R.id.menu_mute_notifications:
       onToggleMute(accountId);
-      break;
+    } else if (itemId == R.id.menu_set_tag) {
-    case R.id.menu_set_tag:
       onSetTag(accountId);
-      break;
     }
   }
 

src/main/java/org/thoughtcrime/securesms/contacts/NewContactActivity.java

@@ -68,11 +68,11 @@ public class NewContactActivity extends PassphraseRequiredActionBarActivity
   @Override
   public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
+    int itemId = item.getItemId();
-      case android.R.id.home:
+    if (itemId == android.R.id.home) {
       finish();
       return true;
-      case R.id.menu_create_contact:
+    } else if (itemId == R.id.menu_create_contact) {
       String addr = addrInput.getText() == null ? "" : addrInput.getText().toString();
       String name = nameInput.getText() == null ? "" : nameInput.getText().toString();
       if (name.isEmpty()) name = null;

src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java

@@ -143,8 +143,7 @@ public class BackupProviderFragment extends Fragment implements DcEventCenter.Dc
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
       super.onOptionsItemSelected(item);
 
-      switch (item.getItemId()) {
+      if (item.getItemId() == R.id.copy) {
-        case R.id.copy:
         if (dcBackupProvider != null) {
           Util.writeTextToClipboard(getActivity(), dcBackupProvider.getQr());
           Toast.makeText(getActivity(), getString(R.string.done), Toast.LENGTH_SHORT).show();

src/main/java/org/thoughtcrime/securesms/qr/BackupTransferActivity.java

@@ -112,14 +112,14 @@ public class BackupTransferActivity extends BaseActionBarActivity {
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         super.onOptionsItemSelected(item);
 
-        switch (item.getItemId()) {
+      int itemId = item.getItemId();
-            case android.R.id.home:
+      if (itemId == android.R.id.home) {
         finishOrAskToFinish();
         return true;
-            case R.id.troubleshooting:
+      } else if (itemId == R.id.troubleshooting) {
         DcHelper.openHelp(this, "#multiclient");
         return true;
-            case R.id.view_log_button:
+      } else if (itemId == R.id.view_log_button) {
         startActivity(new Intent(this, LogViewActivity.class));
         return true;
       }

src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java

@@ -126,23 +126,19 @@ public class QrActivity extends BaseActionBarActivity implements View.OnClickLis
     public boolean onOptionsItemSelected(MenuItem item) {
         super.onOptionsItemSelected(item);
 
-        switch (item.getItemId()) {
+      int itemId = item.getItemId();
-            case android.R.id.home:
+      if (itemId == android.R.id.home) {
         finish();
         return true;
-            case R.id.new_classic_contact:
+      } else if (itemId == R.id.new_classic_contact) {
         this.startActivity(new Intent(this, NewContactActivity.class));
-                break;
+      } else if (itemId == R.id.withdraw) {
-            case R.id.withdraw:
         qrShowFragment.withdrawQr();
-                break;
+      } else if (itemId == R.id.load_from_image) {
-            case R.id.load_from_image:
         AttachmentManager.selectImage(this, REQUEST_CODE_IMAGE);
-                break;
+      } else if (itemId == R.id.paste) {
-            case R.id.paste:
         QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
         qrCodeHandler.handleQrData(Util.getTextFromClipboard(this));
-                break;
       }
 
         return false;

src/main/java/org/thoughtcrime/securesms/qr/QrShowActivity.java

@@ -83,13 +83,12 @@ public class QrShowActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         super.onOptionsItemSelected(item);
 
-        switch (item.getItemId()) {
+      int itemId = item.getItemId();
-            case android.R.id.home:
+      if (itemId == android.R.id.home) {
         finish();
         return true;
-            case R.id.withdraw:
+      } else if (itemId == R.id.withdraw) {
         fragment.withdrawQr();
-                break;
       }
 
         return false;

src/main/java/org/thoughtcrime/securesms/qr/RegistrationQrActivity.java

@@ -77,14 +77,14 @@ public class RegistrationQrActivity extends BaseActionBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         super.onOptionsItemSelected(item);
 
-        switch (item.getItemId()) {
+      int itemId = item.getItemId();
-            case android.R.id.home:
+      if (itemId == android.R.id.home) {
         finish();
         return true;
-            case R.id.troubleshooting:
+      } else if (itemId == R.id.troubleshooting) {
         DcHelper.openHelp(this, "#multiclient");
         return true;
-            case R.id.menu_paste:
+      } else if (itemId == R.id.menu_paste) {
         Intent intent = new Intent();
         intent.putExtra(QRDATA_EXTRA, Util.getTextFromClipboard(this));
         setResult(Activity.RESULT_OK, intent);