gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-16 01:05:04 +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
app/src/main/java/com/nextcloud/talk
components/filebrowser/controllers
BrowserController.java
controllers
ContactsController.javaProfileController.javaRingtoneSelectionController.java
base
BaseController.java

10
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

18
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);

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

@ -157,70 +157,67 @@ 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(); }
edit = !edit;
if (edit) {
item.setTitle(R.string.save);
getActivity().findViewById(R.id.emptyList).setVisibility(View.GONE);
getActivity().findViewById(R.id.userinfo_list).setVisibility(View.VISIBLE);
if (CapabilitiesUtil.isAvatarEndpointAvailable(currentUser)) {
// TODO later avatar can also be checked via user fields, for now it is in Talk capability
getActivity().findViewById(R.id.avatar_buttons).setVisibility(View.VISIBLE);
} }
edit = !edit; ncApi.getEditableUserProfileFields(
ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()),
ApiUtils.getUrlForUserFields(currentUser.getBaseUrl()))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<UserProfileFieldsOverall>() {
@Override
public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
// unused atm
}
if (edit) { @Override
item.setTitle(R.string.save); public void onNext(@io.reactivex.annotations.NonNull UserProfileFieldsOverall userProfileFieldsOverall) {
editableFields = userProfileFieldsOverall.getOcs().getData();
adapter.notifyDataSetChanged();
}
getActivity().findViewById(R.id.emptyList).setVisibility(View.GONE); @Override
getActivity().findViewById(R.id.userinfo_list).setVisibility(View.VISIBLE); public void onError(@io.reactivex.annotations.NonNull Throwable e) {
Log.e(TAG, "Error loading editable user profile from server", e);
edit = false;
}
if (CapabilitiesUtil.isAvatarEndpointAvailable(currentUser)) { @Override
// TODO later avatar can also be checked via user fields, for now it is in Talk capability public void onComplete() {
getActivity().findViewById(R.id.avatar_buttons).setVisibility(View.VISIBLE); // unused atm
} }
});
} else {
item.setTitle(R.string.edit);
getActivity().findViewById(R.id.avatar_buttons).setVisibility(View.INVISIBLE);
ncApi.getEditableUserProfileFields( if (adapter.filteredDisplayList.size() == 0) {
ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()), getActivity().findViewById(R.id.emptyList).setVisibility(View.VISIBLE);
ApiUtils.getUrlForUserFields(currentUser.getBaseUrl())) getActivity().findViewById(R.id.userinfo_list).setVisibility(View.GONE);
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<UserProfileFieldsOverall>() {
@Override
public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
// unused atm
}
@Override
public void onNext(@io.reactivex.annotations.NonNull UserProfileFieldsOverall userProfileFieldsOverall) {
editableFields = userProfileFieldsOverall.getOcs().getData();
adapter.notifyDataSetChanged();
}
@Override
public void onError(@io.reactivex.annotations.NonNull Throwable e) {
Log.e(TAG, "Error loading editable user profile from server", e);
edit = false;
}
@Override
public void onComplete() {
// unused atm
}
});
} else {
item.setTitle(R.string.edit);
getActivity().findViewById(R.id.avatar_buttons).setVisibility(View.INVISIBLE);
if (adapter.filteredDisplayList.size() == 0) {
getActivity().findViewById(R.id.emptyList).setVisibility(View.VISIBLE);
getActivity().findViewById(R.id.userinfo_list).setVisibility(View.GONE);
}
} }
}
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
return true; return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
@Override @Override

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

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