Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sebastian Kürten
2021-04-21 14:05:57 +02:00
parent 528a15962f
commit 0a4e23118a
11 changed files with 67 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java
View File

@@ -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

10
briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java
View File

@@ -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

16
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
View File

@@ -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));
}
}

12
briar-android/src/main/java/org/briarproject/briar/android/contactselection/ContactSelectorFragment.java
View File

@@ -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

16
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
View File

@@ -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

12
briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
View File

@@ -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

31
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
View File

@@ -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();
}
}

10
briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListActivity.java
View File

@@ -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() {

16
briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java
View File

@@ -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() {

12
briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java
View File

@@ -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

10
briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java
View File

@@ -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