diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java
index 1c840f68e..0f6819c37 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java
@@ -79,17 +79,15 @@ public class RssFeedManageActivity extends BriarActivity
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				onBackPressed();
-				return true;
-			case R.id.action_rss_feeds_import:
-				Intent i = new Intent(this, RssFeedImportActivity.class);
-				startActivity(i);
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		if (item.getItemId() == android.R.id.home) {
+			onBackPressed();
+			return true;
+		} else if (item.getItemId() == R.id.action_rss_feeds_import) {
+			Intent i = new Intent(this, RssFeedImportActivity.class);
+			startActivity(i);
+			return true;
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java
index e83f71d1d..070eb6661 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java
@@ -101,13 +101,11 @@ public class WriteBlogPostActivity extends BriarActivity
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				onBackPressed();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		if (item.getItemId() == android.R.id.home) {
+			onBackPressed();
+			return true;
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
index 2fc2dcbc8..4f586eb6e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
@@ -123,16 +123,12 @@ public class ContactListFragment extends BaseFragment
 	@Override
 	public void onMenuItemClick(FloatingActionButton fab, @Nullable TextView v,
 			int itemId) {
-		switch (itemId) {
-			case R.id.action_add_contact_nearby:
-				Intent intent =
-						new Intent(getContext(),
-								AddNearbyContactActivity.class);
-				startActivity(intent);
-				return;
-			case R.id.action_add_contact_remotely:
-				startActivity(
-						new Intent(getContext(), AddContactActivity.class));
+		if (itemId == R.id.action_add_contact_nearby) {
+			Intent intent =
+					new Intent(getContext(), AddNearbyContactActivity.class);
+			startActivity(intent);
+		} else if (itemId == R.id.action_add_contact_remotely) {
+			startActivity(new Intent(getContext(), AddContactActivity.class));
 		}
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java
index 25c2ef5fc..634d855fe 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java
@@ -37,14 +37,12 @@ public abstract class ContactSelectorFragment extends
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.action_contacts_selected:
-				selectedContacts = adapter.getSelectedContactIds();
-				listener.contactsSelected(selectedContacts);
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		if (item.getItemId() == R.id.action_contacts_selected) {
+			selectedContacts = adapter.getSelectedContactIds();
+			listener.contactsSelected(selectedContacts);
+			return true;
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
index a181b66f8..25134c047 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
@@ -160,16 +160,14 @@ public class ImageActivity extends BriarActivity
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				onBackPressed();
-				return true;
-			case R.id.action_save_image:
-				showSaveImageDialog();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		if (item.getItemId() == android.R.id.home) {
+			onBackPressed();
+			return true;
+		} else if (item.getItemId() == R.id.action_save_image) {
+			showSaveImageDialog();
+			return true;
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
index d5ed65d33..1d4016e8c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
@@ -122,14 +122,12 @@ public class IntroductionMessageFragment extends BaseFragment
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				hideSoftKeyboard(ui.message);
-				requireActivity().onBackPressed();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		if (item.getItemId() == android.R.id.home) {
+			hideSoftKeyboard(ui.message);
+			requireActivity().onBackPressed();
+			return true;
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
index 5f0b6ec05..abf45348a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
@@ -260,25 +260,18 @@ public class NavDrawerActivity extends BriarActivity implements
 
 	private void loadFragment(int fragmentId) {
 		// TODO re-use fragments from the manager when possible (#606)
-		switch (fragmentId) {
-			case R.id.nav_btn_contacts:
-				startFragment(ContactListFragment.newInstance());
-				break;
-			case R.id.nav_btn_groups:
-				startFragment(GroupListFragment.newInstance());
-				break;
-			case R.id.nav_btn_forums:
-				startFragment(ForumListFragment.newInstance());
-				break;
-			case R.id.nav_btn_blogs:
-				startFragment(FeedFragment.newInstance());
-				break;
-			case R.id.nav_btn_settings:
-				startActivity(new Intent(this, SettingsActivity.class));
-				break;
-			case R.id.nav_btn_signout:
-				signOut();
-				break;
+		if (fragmentId == R.id.nav_btn_contacts) {
+			startFragment(ContactListFragment.newInstance());
+		} else if (fragmentId == R.id.nav_btn_groups) {
+			startFragment(GroupListFragment.newInstance());
+		} else if (fragmentId == R.id.nav_btn_forums) {
+			startFragment(ForumListFragment.newInstance());
+		} else if (fragmentId == R.id.nav_btn_blogs) {
+			startFragment(FeedFragment.newInstance());
+		} else if (fragmentId == R.id.nav_btn_settings) {
+			startActivity(new Intent(this, SettingsActivity.class));
+		} else if (fragmentId == R.id.nav_btn_signout) {
+			signOut();
 		}
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java
index d359068db..7847f905c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java
@@ -104,13 +104,11 @@ public class GroupMemberListActivity extends BriarActivity
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				onBackPressed();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		if (item.getItemId() == android.R.id.home) {
+			onBackPressed();
+			return true;
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	private void loadMembers() {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java
index 33dd285ae..5d7f70bff 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java
@@ -94,16 +94,14 @@ public class RevealContactsActivity extends ContactSelectorActivity
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				onBackPressed();
-				return true;
-			case R.id.action_group_reveal_onboarding:
-				showOnboardingDialog();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		if (item.getItemId() == android.R.id.home) {
+			onBackPressed();
+			return true;
+		} else if (item.getItemId() == R.id.action_group_reveal_onboarding) {
+			showOnboardingDialog();
+			return true;
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	private void showOnboardingDialog() {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java
index 66adce301..bd2d368c2 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java
@@ -73,14 +73,12 @@ public abstract class BaseMessageFragment extends BaseFragment
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				if (message.isKeyboardOpen()) message.hideSoftKeyboard();
-				listener.onBackPressed();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		if (item.getItemId() == android.R.id.home) {
+			if (message.isKeyboardOpen()) message.hideSoftKeyboard();
+			listener.onBackPressed();
+			return true;
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java
index 1bf66256e..db667f051 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java
@@ -116,13 +116,11 @@ abstract class SharingStatusActivity extends BriarActivity
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		// Handle presses on the action bar items
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				onBackPressed();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+		if (item.getItemId() == android.R.id.home) {
+			onBackPressed();
+			return true;
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@StringRes