Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

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

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

Closes #1883

See merge request briar/briar!1438
This commit is contained in:
Torsten Grote
2021-04-22 13:34:35 +00:00
parent 528a15962f 0a4e23118a
commit a9d2aa9366
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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == android.R.id.home) {
case android.R.id.home: onBackPressed();
onBackPressed(); return true;
return true; } else if (item.getItemId() == R.id.action_rss_feeds_import) {
case R.id.action_rss_feeds_import: Intent i = new Intent(this, RssFeedImportActivity.class);
Intent i = new Intent(this, RssFeedImportActivity.class); startActivity(i);
startActivity(i); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == android.R.id.home) {
case android.R.id.home: onBackPressed();
onBackPressed(); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @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 @Override
public void onMenuItemClick(FloatingActionButton fab, @Nullable TextView v, public void onMenuItemClick(FloatingActionButton fab, @Nullable TextView v,
int itemId) { int itemId) {
switch (itemId) { if (itemId == R.id.action_add_contact_nearby) {
case R.id.action_add_contact_nearby: Intent intent =
Intent intent = new Intent(getContext(), AddNearbyContactActivity.class);
new Intent(getContext(), startActivity(intent);
AddNearbyContactActivity.class); } else if (itemId == R.id.action_add_contact_remotely) {
startActivity(intent); startActivity(new Intent(getContext(), AddContactActivity.class));
return;
case 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 @Override
public boolean onOptionsItemSelected(MenuItem item) { 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();
selectedContacts = adapter.getSelectedContactIds(); listener.contactsSelected(selectedContacts);
listener.contactsSelected(selectedContacts); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == android.R.id.home) {
case android.R.id.home: onBackPressed();
onBackPressed(); return true;
return true; } else if (item.getItemId() == R.id.action_save_image) {
case R.id.action_save_image: showSaveImageDialog();
showSaveImageDialog(); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == android.R.id.home) {
case android.R.id.home: hideSoftKeyboard(ui.message);
hideSoftKeyboard(ui.message); requireActivity().onBackPressed();
requireActivity().onBackPressed(); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @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) { private void loadFragment(int fragmentId) {
// TODO re-use fragments from the manager when possible (#606) // 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());
startFragment(ContactListFragment.newInstance()); } else if (fragmentId == R.id.nav_btn_groups) {
break; startFragment(GroupListFragment.newInstance());
case R.id.nav_btn_groups: } else if (fragmentId == R.id.nav_btn_forums) {
startFragment(GroupListFragment.newInstance()); startFragment(ForumListFragment.newInstance());
break; } else if (fragmentId == R.id.nav_btn_blogs) {
case R.id.nav_btn_forums: startFragment(FeedFragment.newInstance());
startFragment(ForumListFragment.newInstance()); } else if (fragmentId == R.id.nav_btn_settings) {
break; startActivity(new Intent(this, SettingsActivity.class));
case R.id.nav_btn_blogs: } else if (fragmentId == R.id.nav_btn_signout) {
startFragment(FeedFragment.newInstance()); signOut();
break;
case R.id.nav_btn_settings:
startActivity(new Intent(this, SettingsActivity.class));
break;
case R.id.nav_btn_signout:
signOut();
break;
} }
} }

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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == android.R.id.home) {
case android.R.id.home: onBackPressed();
onBackPressed(); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
private void loadMembers() { 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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == android.R.id.home) {
case android.R.id.home: onBackPressed();
onBackPressed(); return true;
return true; } else if (item.getItemId() == R.id.action_group_reveal_onboarding) {
case R.id.action_group_reveal_onboarding: showOnboardingDialog();
showOnboardingDialog(); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
private void showOnboardingDialog() { 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 @Override
public boolean onOptionsItemSelected(MenuItem item) { 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();
if (message.isKeyboardOpen()) message.hideSoftKeyboard(); listener.onBackPressed();
listener.onBackPressed(); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
// Handle presses on the action bar items // Handle presses on the action bar items
switch (item.getItemId()) { if (item.getItemId() == android.R.id.home) {
case android.R.id.home: onBackPressed();
onBackPressed(); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@StringRes @StringRes