Merge branch '1883-resource-ids-will-be-non-final' into 'master'

Replace switch statements with resource ids with if-then-else

Closes #1883

See merge request briar/briar!1438

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()) {
+		if (item.getItemId() == android.R.id.home) {
-			case android.R.id.home:
 			onBackPressed();
 			return true;
-			case R.id.action_rss_feeds_import:
+		} else if (item.getItemId() == R.id.action_rss_feeds_import) {
 			Intent i = new Intent(this, RssFeedImportActivity.class);
 			startActivity(i);
 			return true;
-			default:
-				return super.onOptionsItemSelected(item);
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override

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()) {
+		if (item.getItemId() == android.R.id.home) {
-			case android.R.id.home:
 			onBackPressed();
 			return true;
-			default:
-				return super.onOptionsItemSelected(item);
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override

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) {
+		if (itemId == R.id.action_add_contact_nearby) {
-			case R.id.action_add_contact_nearby:
 			Intent intent =
-						new Intent(getContext(),
+					new Intent(getContext(), AddNearbyContactActivity.class);
-								AddNearbyContactActivity.class);
 			startActivity(intent);
-				return;
+		} else if (itemId == R.id.action_add_contact_remotely) {
-			case R.id.action_add_contact_remotely:
+			startActivity(new Intent(getContext(), AddContactActivity.class));
-				startActivity(
-						new Intent(getContext(), AddContactActivity.class));
 		}
 	}
 

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()) {
+		if (item.getItemId() == R.id.action_contacts_selected) {
-			case R.id.action_contacts_selected:
 			selectedContacts = adapter.getSelectedContactIds();
 			listener.contactsSelected(selectedContacts);
 			return true;
-			default:
-				return super.onOptionsItemSelected(item);
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override

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()) {
+		if (item.getItemId() == android.R.id.home) {
-			case android.R.id.home:
 			onBackPressed();
 			return true;
-			case R.id.action_save_image:
+		} else if (item.getItemId() == R.id.action_save_image) {
 			showSaveImageDialog();
 			return true;
-			default:
-				return super.onOptionsItemSelected(item);
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override

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()) {
+		if (item.getItemId() == android.R.id.home) {
-			case android.R.id.home:
 			hideSoftKeyboard(ui.message);
 			requireActivity().onBackPressed();
 			return true;
-			default:
-				return super.onOptionsItemSelected(item);
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override

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) {
+		if (fragmentId == R.id.nav_btn_contacts) {
-			case R.id.nav_btn_contacts:
 			startFragment(ContactListFragment.newInstance());
-				break;
+		} else if (fragmentId == R.id.nav_btn_groups) {
-			case R.id.nav_btn_groups:
 			startFragment(GroupListFragment.newInstance());
-				break;
+		} else if (fragmentId == R.id.nav_btn_forums) {
-			case R.id.nav_btn_forums:
 			startFragment(ForumListFragment.newInstance());
-				break;
+		} else if (fragmentId == R.id.nav_btn_blogs) {
-			case R.id.nav_btn_blogs:
 			startFragment(FeedFragment.newInstance());
-				break;
+		} else if (fragmentId == R.id.nav_btn_settings) {
-			case R.id.nav_btn_settings:
 			startActivity(new Intent(this, SettingsActivity.class));
-				break;
+		} else if (fragmentId == R.id.nav_btn_signout) {
-			case R.id.nav_btn_signout:
 			signOut();
-				break;
 		}
 	}
 

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()) {
+		if (item.getItemId() == android.R.id.home) {
-			case android.R.id.home:
 			onBackPressed();
 			return true;
-			default:
-				return super.onOptionsItemSelected(item);
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	private void loadMembers() {

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()) {
+		if (item.getItemId() == android.R.id.home) {
-			case android.R.id.home:
 			onBackPressed();
 			return true;
-			case R.id.action_group_reveal_onboarding:
+		} else if (item.getItemId() == R.id.action_group_reveal_onboarding) {
 			showOnboardingDialog();
 			return true;
-			default:
-				return super.onOptionsItemSelected(item);
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	private void showOnboardingDialog() {

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()) {
+		if (item.getItemId() == android.R.id.home) {
-			case android.R.id.home:
 			if (message.isKeyboardOpen()) message.hideSoftKeyboard();
 			listener.onBackPressed();
 			return true;
-			default:
-				return super.onOptionsItemSelected(item);
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@Override

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()) {
+		if (item.getItemId() == android.R.id.home) {
-			case android.R.id.home:
 			onBackPressed();
 			return true;
-			default:
-				return super.onOptionsItemSelected(item);
 		}
+		return super.onOptionsItemSelected(item);
 	}
 
 	@StringRes