gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

replace menu switch statements with if/else

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-05-26 20:59:11 +02:00
parent 3c0ef1d1e0
commit 45a88c0722
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
5 changed files with 70 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/controllers/BrowserController.java
View File

@ -145,13 +145,11 @@ public abstract class BrowserController extends BaseController implements Listin
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == R.id.files_selection_done) {
case R.id.files_selection_done:
onFileSelectionDone(); onFileSelectionDone();
return true; return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @Override

14
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -436,20 +436,18 @@ public class ContactsController extends BaseController implements SearchView.OnQ
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) { int itemId = item.getItemId();
case android.R.id.home: if (itemId == android.R.id.home) {
getRouter().popCurrentController(); return getRouter().popCurrentController();
return true; } else if (itemId == R.id.contacts_selection_done) {
case R.id.contacts_selection_done:
selectionDone(); selectionDone();
return true; return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @Override
public void onCreateOptionsMenu(Menu menu, @NonNull MenuInflater inflater) { public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater); super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.menu_contacts, menu); inflater.inflate(R.menu.menu_contacts, menu);
searchItem = menu.findItem(R.id.action_search); searchItem = menu.findItem(R.id.action_search);

7
app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java
View File

@ -157,8 +157,7 @@ public class ProfileController extends BaseController {
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == R.id.edit) {
case R.id.edit:
if (edit) { if (edit) {
save(); save();
} }
@ -217,10 +216,8 @@ public class ProfileController extends BaseController {
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
return true; return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @Override

6
app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java
View File

@ -116,12 +116,10 @@ public class RingtoneSelectionController extends BaseController implements Flexi
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == android.R.id.home) {
case android.R.id.home:
return getRouter().popCurrentController(); return getRouter().popCurrentController();
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
private void prepareViews() { private void prepareViews() {

6
app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java
View File

@ -84,13 +84,11 @@ public abstract class BaseController extends ButterKnifeController {
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == android.R.id.home) {
case android.R.id.home:
getRouter().popCurrentController(); getRouter().popCurrentController();
return true; return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
private void cleanTempCertPreference() { private void cleanTempCertPreference() {