Replaced resource ID switches by ifs

pull/194/head
M66B 5 years ago
parent b8662875f9
commit 3e41dd2e49

@ -673,14 +673,12 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
if (item.getItemId() == android.R.id.home) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
onBackPressed();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
protected boolean backHandled() {

@ -355,13 +355,11 @@ public class ActivityEML extends ActivityBase {
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_save:
if (item.getItemId() == R.id.menu_save) {
onMenuSave();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuSave() {

@ -116,19 +116,18 @@ public class ActivitySignature extends ActivityBase {
bottom_navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.action_insert_image:
int itemId = item.getItemId();
if (itemId == R.id.action_insert_image) {
insertImage();
return true;
case R.id.action_delete:
} else if (itemId == R.id.action_delete) {
delete();
return true;
case R.id.action_save:
} else if (itemId == R.id.action_save) {
save();
return true;
default:
return false;
}
return false;
}
});
@ -160,19 +159,16 @@ public class ActivitySignature extends ActivityBase {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.menu_signature, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_edit_html:
if (item.getItemId() == R.id.menu_edit_html) {
item.setChecked(!item.isChecked());
html(item.isChecked());
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
@Override

@ -328,26 +328,21 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_enabled:
int itemId = item.getItemId();
if (itemId == R.string.title_enabled) {
onActionSync(!item.isChecked());
return true;
case R.string.title_primary:
} else if (itemId == R.string.title_primary) {
onActionPrimary(!item.isChecked());
return true;
case R.string.title_edit_channel:
} else if (itemId == R.string.title_edit_channel) {
onActionEditChannel();
return true;
case R.string.title_copy:
} else if (itemId == R.string.title_copy) {
onActionCopy();
return true;
default:
return false;
}
return false;
}
private void onActionSync(boolean sync) {

@ -137,22 +137,18 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_compose:
int itemId = item.getItemId();
if (itemId == R.string.title_compose) {
onActionCompose();
return true;
case R.string.title_answer_hide:
} else if (itemId == R.string.title_answer_hide) {
onActionHide(!item.isChecked());
return true;
case R.string.title_copy:
} else if (itemId == R.string.title_copy) {
onActionCopy();
return true;
default:
return false;
}
return false;
}
private void onActionCompose() {

@ -98,14 +98,11 @@ public class AdapterCertificate extends RecyclerView.Adapter<AdapterCertificate.
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_delete:
if (item.getItemId() == R.string.title_delete) {
onActionDelete();
return true;
default:
return false;
}
return false;
}
private void onActionDelete() {

@ -235,25 +235,24 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_advanced_never_favorite:
int itemId = item.getItemId();
if (itemId == R.string.title_advanced_never_favorite) {
onActionNeverFavorite();
return true;
case R.string.title_share:
} else if (itemId == R.string.title_share) {
onActionShare();
return true;
case R.string.title_pin:
} else if (itemId == R.string.title_pin) {
onActionPin();
return true;
case R.string.title_advanced_edit_name:
} else if (itemId == R.string.title_advanced_edit_name) {
onActionEdit();
return true;
case R.string.title_delete:
} else if (itemId == R.string.title_delete) {
onActionDelete();
return true;
default:
return false;
}
return false;
}
private void onActionNeverFavorite() {

@ -393,15 +393,12 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (folder.tbd != null)
return;
switch (view.getId()) {
case R.id.ibExpander:
int id = view.getId();
if (id == R.id.ibExpander) {
onCollapse(folder);
break;
case R.id.tvFlagged:
case R.id.ibFlagged:
} else if (id == R.id.tvFlagged || id == R.id.ibFlagged) {
onFlagged(folder);
break;
default:
} else {
if (listener == null) {
if (!folder.selectable)
return;
@ -585,95 +582,74 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
@Override
public boolean onMenuItemClick(MenuItem item) {
if (item.getGroupId() == Menu.FIRST) {
switch (item.getItemId()) {
case R.string.title_synchronize_now:
int itemId = item.getItemId();
if (itemId == R.string.title_synchronize_now) {
onActionSync(true);
return true;
case R.string.title_synchronize_batch_enable:
} else if (itemId == R.string.title_synchronize_batch_enable) {
onActionEnable(true);
return true;
case R.string.title_synchronize_batch_disable:
} else if (itemId == R.string.title_synchronize_batch_disable) {
onActionEnable(false);
return true;
default:
return false;
}
return false;
}
switch (item.getItemId()) {
case R.string.title_synchronize_now:
int itemId = item.getItemId();
if (itemId == R.string.title_synchronize_now) {
onActionSync(false);
return true;
case R.string.title_synchronize_more:
} else if (itemId == R.string.title_synchronize_more) {
onActionSyncMore();
return true;
case R.string.title_unified_folder:
case R.string.title_navigation_folder:
case R.string.title_notify_folder:
case R.string.title_synchronize_enabled:
} else if (itemId == R.string.title_unified_folder || itemId == R.string.title_navigation_folder || itemId == R.string.title_notify_folder || itemId == R.string.title_synchronize_enabled) {
onActionProperty(item.getItemId(), !item.isChecked());
return true;
case R.string.title_subscribe:
} else if (itemId == R.string.title_subscribe) {
onActionSubscribe();
return true;
case R.string.title_delete_local:
} else if (itemId == R.string.title_delete_local) {
OnActionDeleteLocal(false);
return true;
case R.string.title_delete_browsed:
} else if (itemId == R.string.title_delete_browsed) {
OnActionDeleteLocal(true);
return true;
case R.string.title_empty_trash:
} else if (itemId == R.string.title_empty_trash) {
onActionEmpty(EntityFolder.TRASH);
return true;
case R.string.title_empty_spam:
} else if (itemId == R.string.title_empty_spam) {
onActionEmpty(EntityFolder.JUNK);
return true;
case R.string.title_edit_rules:
} else if (itemId == R.string.title_edit_rules) {
onActionEditRules();
return true;
case R.string.title_edit_properties:
} else if (itemId == R.string.title_edit_properties) {
onActionEditProperties();
return true;
case R.string.title_create_channel:
} else if (itemId == R.string.title_create_channel) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
onActionCreateChannel();
return true;
case R.string.title_edit_channel:
} else if (itemId == R.string.title_edit_channel) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
onActionEditChannel();
return true;
case R.string.title_delete_channel:
} else if (itemId == R.string.title_delete_channel) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
onActionDeleteChannel();
return true;
case R.string.title_create_sub_folder:
} else if (itemId == R.string.title_create_sub_folder) {
onActionCreateFolder();
return true;
case R.string.title_pin:
} else if (itemId == R.string.title_pin) {
onActionPinFolder();
return true;
case R.string.title_delete:
} else if (itemId == R.string.title_delete) {
onActionDeleteFolder();
return true;
default:
return false;
}
return false;
}
private void onActionSync(boolean childs) {
@ -754,21 +730,16 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
boolean enabled = args.getBoolean("enabled");
DB db = DB.getInstance(context);
switch (property) {
case R.string.title_unified_folder:
if (property == R.string.title_unified_folder) {
db.folder().setFolderUnified(id, enabled);
break;
case R.string.title_navigation_folder:
} else if (property == R.string.title_navigation_folder) {
db.folder().setFolderNavigation(id, enabled);
break;
case R.string.title_notify_folder:
} else if (property == R.string.title_notify_folder) {
db.folder().setFolderNotify(id, enabled);
break;
case R.string.title_synchronize_enabled:
} else if (property == R.string.title_synchronize_enabled) {
db.folder().setFolderSynchronize(id, enabled);
ServiceSynchronize.reload(context, aid, false, "folder sync=" + enabled);
break;
default:
} else {
throw new IllegalArgumentException("Unknown folder property=" + property);
}

@ -217,26 +217,21 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_enabled:
int itemId = item.getItemId();
if (itemId == R.string.title_enabled) {
onActionSync(!item.isChecked());
return true;
case R.string.title_primary:
} else if (itemId == R.string.title_primary) {
onActionPrimary(!item.isChecked());
return true;
case R.string.title_reset_sign_key:
} else if (itemId == R.string.title_reset_sign_key) {
onActionClearSignKey();
return true;
case R.string.title_copy:
} else if (itemId == R.string.title_copy) {
onActionCopy();
return true;
default:
return false;
}
return false;
}
private void onActionSync(boolean sync) {

@ -2770,16 +2770,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
InternetAddress to = (InternetAddress) message.to[0];
Attendee attendee = new Attendee(to.getPersonal(), to.getAddress());
switch (action) {
case R.id.btnCalendarAccept:
if (action == R.id.btnCalendarAccept) {
attendee.setParticipationStatus(ParticipationStatus.ACCEPTED);
break;
case R.id.btnCalendarDecline:
} else if (action == R.id.btnCalendarDecline) {
attendee.setParticipationStatus(ParticipationStatus.DECLINED);
break;
case R.id.btnCalendarMaybe:
} else if (action == R.id.btnCalendarMaybe) {
attendee.setParticipationStatus(ParticipationStatus.TENTATIVE);
break;
}
ev.addAttendee(attendee);
@ -2805,16 +2801,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
protected void onExecuted(Bundle args, Object result) {
if (result instanceof File) {
String status = null;
switch (action) {
case R.id.btnCalendarAccept:
if (action == R.id.btnCalendarAccept) {
status = context.getString(R.string.title_icalendar_accept);
break;
case R.id.btnCalendarDecline:
} else if (action == R.id.btnCalendarDecline) {
status = context.getString(R.string.title_icalendar_decline);
break;
case R.id.btnCalendarMaybe:
} else if (action == R.id.btnCalendarMaybe) {
status = context.getString(R.string.title_icalendar_maybe);
break;
}
if (args.getBoolean("share"))
@ -2925,25 +2917,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
else if (view.getId() == R.id.ibAddContact)
onAddContact(message);
else if (viewType == ViewType.THREAD) {
switch (view.getId()) {
case R.id.ibExpanderAddress:
int id = view.getId();
if (id == R.id.ibExpanderAddress) {
onToggleAddresses(message);
break;
case R.id.ibSaveAttachments:
} else if (id == R.id.ibSaveAttachments) {
onSaveAttachments(message);
break;
case R.id.ibDownloadAttachments:
} else if (id == R.id.ibDownloadAttachments) {
onDownloadAttachments(message);
break;
case R.id.ibFull:
} else if (id == R.id.ibFull) {
onShow(message, true);
break;
case R.id.ibImages:
} else if (id == R.id.ibImages) {
onShow(message, false);
break;
case R.id.ibDecrypt:
} else if (id == R.id.ibDecrypt) {
boolean lock =
(EntityMessage.PGP_SIGNENCRYPT.equals(message.ui_encrypt) &&
!EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt)) ||
@ -2953,90 +2938,56 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
properties.lock(message.id);
else
onActionDecrypt(message, false);
break;
case R.id.ibVerify:
} else if (id == R.id.ibVerify) {
onActionDecrypt(message, false);
break;
case R.id.ibUndo:
} else if (id == R.id.ibUndo) {
FragmentMessages.onActionUndo(message, context, owner, parentFragment.getParentFragmentManager());
break;
case R.id.ibRule:
} else if (id == R.id.ibRule) {
onMenuCreateRule(message);
break;
case R.id.ibUnsubscribe:
} else if (id == R.id.ibUnsubscribe) {
onActionUnsubscribe(message);
break;
case R.id.ibPrint:
} else if (id == R.id.ibPrint) {
onMenuPrint(message);
break;
case R.id.ibShare:
} else if (id == R.id.ibShare) {
onMenuShare(message, false);
break;
case R.id.ibEvent:
} else if (id == R.id.ibEvent) {
if (ActivityBilling.isPro(context))
onMenuShare(message, true);
else
context.startActivity(new Intent(context, ActivityBilling.class));
break;
case R.id.ibSearch:
} else if (id == R.id.ibSearch) {
onSearchContact(message);
break;
case R.id.ibAnswer:
} else if (id == R.id.ibAnswer) {
onActionAnswer(message, ibAnswer);
break;
case R.id.ibNotes:
} else if (id == R.id.ibNotes) {
onMenuNotes(message);
break;
case R.id.ibLabels:
} else if (id == R.id.ibLabels) {
onActionLabels(message);
break;
case R.id.ibKeywords:
} else if (id == R.id.ibKeywords) {
onMenuManageKeywords(message);
break;
case R.id.ibCopy:
} else if (id == R.id.ibCopy) {
onActionMove(message, true);
break;
case R.id.ibMove:
} else if (id == R.id.ibMove) {
onActionMove(message, false);
break;
case R.id.ibArchive:
case R.id.ibArchiveBottom:
} else if (id == R.id.ibArchive || id == R.id.ibArchiveBottom) {
onActionArchive(message);
break;
case R.id.ibTrash:
case R.id.ibTrashBottom:
} else if (id == R.id.ibTrash || id == R.id.ibTrashBottom) {
onActionTrash(message, (Boolean) ibTrash.getTag());
break;
case R.id.ibJunk:
} else if (id == R.id.ibJunk) {
onActionJunk(message);
break;
case R.id.ibInbox:
} else if (id == R.id.ibInbox) {
onActionInbox(message);
break;
case R.id.ibMore:
} else if (id == R.id.ibMore) {
onActionMore(message);
break;
case R.id.ibTools:
} else if (id == R.id.ibTools) {
onActionTools(message);
break;
case R.id.ibDownloading:
} else if (id == R.id.ibDownloading) {
Helper.viewFAQ(context, 15);
break;
case R.id.ibSeen:
case R.id.ibSeenBottom:
} else if (id == R.id.ibSeen || id == R.id.ibSeenBottom) {
onMenuUnseen(message);
break;
case R.id.btnCalendarAccept:
case R.id.btnCalendarDecline:
case R.id.btnCalendarMaybe:
case R.id.ibCalendar:
} else if (id == R.id.btnCalendarAccept || id == R.id.btnCalendarDecline || id == R.id.btnCalendarMaybe || id == R.id.ibCalendar) {
onActionCalendar(message, view.getId(), false);
break;
default:
} else {
onToggleMessage(message);
}
} else {
@ -3154,27 +3105,23 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (message == null || message.folderReadOnly)
return false;
switch (view.getId()) {
case R.id.ibFlagged:
int id = view.getId();
if (id == R.id.ibFlagged) {
onMenuColoredStar(message);
return true;
case R.id.ibFull:
} else if (id == R.id.ibFull) {
onActionOpenFull(message);
return true;
case R.id.ibTrash:
case R.id.ibTrashBottom:
} else if (id == R.id.ibTrash || id == R.id.ibTrashBottom) {
if (EntityFolder.OUTBOX.equals(message.folderType))
return false;
onActionTrash(message, true);
return true;
case R.id.btnCalendarAccept:
case R.id.btnCalendarDecline:
case R.id.btnCalendarMaybe:
} else if (id == R.id.btnCalendarAccept || id == R.id.btnCalendarDecline || id == R.id.btnCalendarMaybe) {
onActionCalendar(message, view.getId(), true);
return true;
default:
return false;
}
return false;
}
public boolean onKeyPressed(KeyEvent event) {
@ -3434,22 +3381,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_create_channel:
int itemId = item.getItemId();
if (itemId == R.string.title_create_channel) {
onActionCreateChannel();
return true;
case R.string.title_edit_channel:
} else if (itemId == R.string.title_edit_channel) {
onActionEditChannel();
return true;
case R.string.title_delete_channel:
} else if (itemId == R.string.title_delete_channel) {
onActionDeleteChannel();
return true;
default:
return false;
}
return false;
}
@TargetApi(Build.VERSION_CODES.O)
@ -3533,18 +3476,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_insert_contact:
int itemId = item.getItemId();
if (itemId == R.string.title_insert_contact) {
onInsertContact(name, email);
return true;
case R.string.title_edit_contact:
} else if (itemId == R.string.title_edit_contact) {
onPickContact(name, email);
return true;
default:
return false;
}
return false;
}
});
@ -4129,119 +4069,118 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem target) {
switch (target.getItemId()) {
case R.id.menu_button_junk:
int itemId = target.getItemId();
if (itemId == R.id.menu_button_junk) {
onMenuButton(message, "junk", target.isChecked());
return true;
case R.id.menu_button_trash:
} else if (itemId == R.id.menu_button_trash) {
onMenuButton(message, "trash", target.isChecked());
return true;
case R.id.menu_button_archive:
} else if (itemId == R.id.menu_button_archive) {
onMenuButton(message, "archive", target.isChecked());
return true;
case R.id.menu_button_move:
} else if (itemId == R.id.menu_button_move) {
onMenuButton(message, "move", target.isChecked());
return true;
case R.id.menu_button_copy:
} else if (itemId == R.id.menu_button_copy) {
onMenuButton(message, "copy", target.isChecked());
return true;
case R.id.menu_button_keywords:
} else if (itemId == R.id.menu_button_keywords) {
onMenuButton(message, "keywords", target.isChecked());
return true;
case R.id.menu_button_notes:
} else if (itemId == R.id.menu_button_notes) {
onMenuButton(message, "notes", target.isChecked());
return true;
case R.id.menu_button_seen:
} else if (itemId == R.id.menu_button_seen) {
onMenuButton(message, "seen", target.isChecked());
return true;
case R.id.menu_button_search:
} else if (itemId == R.id.menu_button_search) {
onMenuButton(message, "search", target.isChecked());
bindAddresses(message);
return true;
case R.id.menu_button_event:
} else if (itemId == R.id.menu_button_event) {
onMenuButton(message, "event", target.isChecked());
return true;
case R.id.menu_button_share:
} else if (itemId == R.id.menu_button_share) {
onMenuButton(message, "share", target.isChecked());
return true;
case R.id.menu_button_print:
} else if (itemId == R.id.menu_button_print) {
onMenuButton(message, "print", target.isChecked());
return true;
case R.id.menu_button_unsubscribe:
} else if (itemId == R.id.menu_button_unsubscribe) {
onMenuButton(message, "unsubscribe", target.isChecked());
return true;
case R.id.menu_button_rule:
} else if (itemId == R.id.menu_button_rule) {
onMenuButton(message, "rule", target.isChecked());
return true;
case R.id.menu_unseen:
} else if (itemId == R.id.menu_unseen) {
onMenuUnseen(message);
return true;
case R.id.menu_snooze:
} else if (itemId == R.id.menu_snooze) {
onMenuSnooze(message);
return true;
case R.id.menu_hide:
} else if (itemId == R.id.menu_hide) {
onMenuHide(message);
return true;
case R.id.menu_flag_color:
} else if (itemId == R.id.menu_flag_color) {
onMenuColoredStar(message);
return true;
case R.id.menu_set_importance_low:
} else if (itemId == R.id.menu_set_importance_low) {
onMenuSetImportance(message, EntityMessage.PRIORITIY_LOW);
return true;
case R.id.menu_set_importance_normal:
} else if (itemId == R.id.menu_set_importance_normal) {
onMenuSetImportance(message, EntityMessage.PRIORITIY_NORMAL);
return true;
case R.id.menu_set_importance_high:
} else if (itemId == R.id.menu_set_importance_high) {
onMenuSetImportance(message, EntityMessage.PRIORITIY_HIGH);
return true;
case R.id.menu_move_to:
} else if (itemId == R.id.menu_move_to) {
onActionMove(message, false);
return true;
case R.id.menu_copy_to:
} else if (itemId == R.id.menu_copy_to) {
onActionMove(message, true);
return true;
case R.id.menu_delete:
} else if (itemId == R.id.menu_delete) {
onMenuDelete(message);
return true;
case R.id.menu_resync:
} else if (itemId == R.id.menu_resync) {
onMenuResync(message);
return true;
case R.id.menu_edit_notes:
} else if (itemId == R.id.menu_edit_notes) {
onMenuNotes(message);
return true;
case R.id.menu_search_in_text:
} else if (itemId == R.id.menu_search_in_text) {
onMenuSearch(message);
return true;
case R.id.menu_create_rule:
} else if (itemId == R.id.menu_create_rule) {
onMenuCreateRule(message);
return true;
case R.id.menu_manage_keywords:
} else if (itemId == R.id.menu_manage_keywords) {
onMenuManageKeywords(message);
return true;
case R.id.menu_share:
} else if (itemId == R.id.menu_share) {
onMenuShare(message, false);
return true;
case R.id.menu_event:
} else if (itemId == R.id.menu_event) {
if (ActivityBilling.isPro(context))
onMenuShare(message, true);
else
context.startActivity(new Intent(context, ActivityBilling.class));
return true;
case R.id.menu_print:
} else if (itemId == R.id.menu_print) {
onMenuPrint(message);
return true;
case R.id.menu_show_headers:
} else if (itemId == R.id.menu_show_headers) {
onMenuShowHeaders(message);
return true;
case R.id.menu_raw_save:
} else if (itemId == R.id.menu_raw_save) {
onMenuRawSave(message);
return true;
case R.id.menu_raw_send:
} else if (itemId == R.id.menu_raw_send) {
onMenuRawSend(message);
return true;
default:
return false;
}
return false;
}
});
popupMenu.show();
@ -5171,30 +5110,26 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (message == null)
return false;
boolean expanded = properties.getValue("expanded", message.id);
switch (action) {
case R.id.ibExpander:
if (action == R.id.ibExpander) {
onToggleMessage(message);
return true;
case R.id.ibAvatar:
} else if (action == R.id.ibAvatar) {
onViewContact(message);
return true;
case R.id.ibFlagged:
} else if (action == R.id.ibFlagged) {
onToggleFlag(message);
return true;
case R.id.ibAuth:
} else if (action == R.id.ibAuth) {
onShowAuth(message);
return true;
case R.id.ibSnoozed:
} else if (action == R.id.ibSnoozed) {
onShowSnoozed(message);
return true;
case R.id.ibHelp:
} else if (action == R.id.ibHelp) {
onHelp(message);
return true;
default:
return super.performAccessibilityAction(host, action, args);
}
return super.performAccessibilityAction(host, action, args);
}
private String populateContentDescription(TupleMessageEx message) {

@ -208,13 +208,11 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_delete:
if (item.getItemId() == R.string.title_delete) {
onActionDelete();
return true;
default:
return false;
}
return false;
}
private void onActionDelete() {

@ -237,30 +237,24 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_rule_enabled:
int itemId = item.getItemId();
if (itemId == R.string.title_rule_enabled) {
onActionEnabled(!item.isChecked());
return true;
case R.string.title_rule_execute:
} else if (itemId == R.string.title_rule_execute) {
onActionExecute();
return true;
case R.string.title_reset:
} else if (itemId == R.string.title_reset) {
onActionReset();
return true;
case R.string.title_move_to_folder:
} else if (itemId == R.string.title_move_to_folder) {
onActionMove();
return true;
case R.string.title_copy:
} else if (itemId == R.string.title_copy) {
onActionCopy();
return true;
default:
return false;
}
return false;
}
private void onActionEnabled(boolean enabled) {

@ -95,16 +95,15 @@ public class FragmentAbout extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_changelog:
int itemId = item.getItemId();
if (itemId == R.id.menu_changelog) {
onMenuChangelog();
return true;
case R.id.menu_attribution:
} else if (itemId == R.id.menu_attribution) {
onMenuAttribution();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuChangelog() {

@ -1563,13 +1563,11 @@ public class FragmentAccount extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_delete:
if (item.getItemId() == R.id.menu_delete) {
onMenuDelete();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDelete() {

@ -151,16 +151,15 @@ public class FragmentAccounts extends FragmentBase {
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_imap:
int itemId = item.getItemId();
if (itemId == R.string.title_imap) {
onCreate(true);
return true;
case R.string.title_pop3:
} else if (itemId == R.string.title_pop3) {
onCreate(false);
return true;
default:
return false;
}
return false;
}
private void onCreate(boolean imap) {
@ -306,22 +305,21 @@ public class FragmentAccounts extends FragmentBase {
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_search:
int itemId = item.getItemId();
if (itemId == R.id.menu_search) {
onMenuSearch();
return true;
case R.id.menu_unified:
} else if (itemId == R.id.menu_unified) {
onMenuUnified();
return true;
case R.id.menu_theme:
} else if (itemId == R.id.menu_theme) {
onMenuTheme();
return true;
case R.id.menu_force_sync:
} else if (itemId == R.id.menu_force_sync) {
onMenuForceSync();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuSearch() {

@ -133,19 +133,18 @@ public class FragmentAnswer extends FragmentBase {
bottom_navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
switch (menuItem.getItemId()) {
case R.id.action_insert_image:
int itemId = menuItem.getItemId();
if (itemId == R.id.action_insert_image) {
onInsertImage();
return true;
case R.id.action_delete:
} else if (itemId == R.id.action_delete) {
onActionDelete();
return true;
case R.id.action_save:
} else if (itemId == R.id.action_save) {
onActionSave();
return true;
default:
return false;
}
return false;
}
});
@ -223,13 +222,11 @@ public class FragmentAnswer extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuHelp() {

@ -443,17 +443,14 @@ public class FragmentCompose extends FragmentBase {
@Override
public void onClick(View view) {
int request;
switch (view.getId()) {
case R.id.ivToAdd:
int id = view.getId();
if (id == R.id.ivToAdd) {
request = REQUEST_CONTACT_TO;
break;
case R.id.ivCcAdd:
} else if (id == R.id.ivCcAdd) {
request = REQUEST_CONTACT_CC;
break;
case R.id.ivBccAdd:
} else if (id == R.id.ivBccAdd) {
request = REQUEST_CONTACT_BCC;
break;
default:
} else {
return;
}
@ -703,25 +700,23 @@ public class FragmentCompose extends FragmentBase {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
int action = item.getItemId();
switch (action) {
case R.id.menu_record_audio:
if (action == R.id.menu_record_audio) {
onActionRecordAudio();
return true;
case R.id.menu_take_photo:
} else if (action == R.id.menu_take_photo) {
onActionImage(true);
return true;
case R.id.menu_image:
} else if (action == R.id.menu_image) {
onActionImage(false);
return true;
case R.id.menu_attachment:
} else if (action == R.id.menu_attachment) {
onActionAttachment();
return true;
case R.id.menu_link:
} else if (action == R.id.menu_link) {
onActionLink();
return true;
default:
return onActionStyle(action, media_bar.findViewById(action));
}
return onActionStyle(action, media_bar.findViewById(action));
}
});
@ -731,18 +726,14 @@ public class FragmentCompose extends FragmentBase {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
final int action = item.getItemId();
switch (action) {
case R.id.action_delete:
if (action == R.id.action_delete) {
onActionDiscard();
break;
case R.id.action_send:
} else if (action == R.id.action_send) {
onAction(R.id.action_check, "check");
break;
case R.id.action_save:
} else if (action == R.id.action_save) {
saved = true;
onAction(action, "save");
break;
default:
} else {
onAction(action, "navigation");
}
return true;
@ -1043,22 +1034,18 @@ public class FragmentCompose extends FragmentBase {
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_edit_plain_text:
int itemId = item.getItemId();
if (itemId == R.string.title_edit_plain_text) {
convertRef(true);
return true;
case R.string.title_edit_formatted_text:
} else if (itemId == R.string.title_edit_formatted_text) {
convertRef(false);
return true;
case R.string.title_delete:
} else if (itemId == R.string.title_delete) {
deleteRef();
return true;
default:
return false;
}
return false;
}
private void convertRef(boolean plain) {
@ -1388,43 +1375,42 @@ public class FragmentCompose extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_encrypt:
int itemId = item.getItemId();
if (itemId == R.id.menu_encrypt) {
onMenuEncrypt();
return true;
case R.id.menu_zoom:
} else if (itemId == R.id.menu_zoom) {
onMenuZoom();
return true;
case R.id.menu_save_drafts:
} else if (itemId == R.id.menu_save_drafts) {
onMenuSaveDrafts();
return true;
case R.id.menu_send_dialog:
} else if (itemId == R.id.menu_send_dialog) {
onMenuSendDialog();
return true;
case R.id.menu_image_dialog:
} else if (itemId == R.id.menu_image_dialog) {
onMenuImageDialog();
return true;
case R.id.menu_media:
} else if (itemId == R.id.menu_media) {
onMenuMediaBar();
return true;
case R.id.menu_compact:
} else if (itemId == R.id.menu_compact) {
onMenuCompact();
return true;
case R.id.menu_contact_group:
} else if (itemId == R.id.menu_contact_group) {
onMenuContactGroup();
return true;
case R.id.menu_answer:
} else if (itemId == R.id.menu_answer) {
onMenuAnswer();
return true;
case R.id.menu_clear:
} else if (itemId == R.id.menu_clear) {
StyleHelper.apply(R.id.menu_clear, getViewLifecycleOwner(), null, etBody);
return true;
case R.id.menu_legend:
} else if (itemId == R.id.menu_legend) {
onMenuLegend();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuAddresses() {
@ -2967,23 +2953,20 @@ public class FragmentCompose extends FragmentBase {
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_send_dialog:
int itemId = item.getItemId();
if (itemId == R.string.title_send_dialog) {
FragmentDialogSend fragment = new FragmentDialogSend();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentCompose.this, REQUEST_SEND);
fragment.show(getParentFragmentManager(), "compose:send");
return true;
case R.string.title_advanced_manage_certificates:
} else if (itemId == R.string.title_advanced_manage_certificates) {
startActivity(
new Intent(getContext(), ActivitySetup.class)
.putExtra("tab", "encryption"));
return true;
default:
return false;
}
return false;
}
});
@ -5055,22 +5038,20 @@ public class FragmentCompose extends FragmentBase {
}
private String getActionName(int id) {
switch (id) {
case R.id.action_delete:
if (id == R.id.action_delete) {
return "delete";
case R.id.action_undo:
} else if (id == R.id.action_undo) {
return "undo";
case R.id.action_redo:
} else if (id == R.id.action_redo) {
return "redo";
case R.id.action_save:
} else if (id == R.id.action_save) {
return "save";
case R.id.action_check:
} else if (id == R.id.action_check) {
return "check";
case R.id.action_send:
} else if (id == R.id.action_send) {
return "send";
default:
return Integer.toString(id);
}
return Integer.toString(id);
}
private void checkAddress(InternetAddress[] addresses, Context context) throws AddressException {

@ -148,16 +148,15 @@ public class FragmentContacts extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
int itemId = item.getItemId();
if (itemId == R.id.menu_help) {
onMenuHelp();
return true;
case R.id.menu_delete:
} else if (itemId == R.id.menu_delete) {
new FragmentDelete().show(getParentFragmentManager(), "contacts:delete");
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuHelp() {

@ -373,20 +373,16 @@ public class FragmentDialogSearch extends FragmentDialogBase {
dialog.dismiss();
BoundaryCallbackMessages.SearchCriteria criteria = new BoundaryCallbackMessages.SearchCriteria();
switch (v.getId()) {
case R.id.ibAttachment:
int id = v.getId();
if (id == R.id.ibAttachment) {
criteria.with_attachments = true;
break;
case R.id.ibInvite:
} else if (id == R.id.ibInvite) {
criteria.with_attachments = true;
criteria.with_types = new String[]{"text/calendar"};
break;
case R.id.ibUnseen:
} else if (id == R.id.ibUnseen) {
criteria.with_unseen = true;
break;
case R.id.ibFlagged:
} else if (id == R.id.ibFlagged) {
criteria.with_flagged = true;
break;
}
FragmentMessages.search(

@ -188,8 +188,8 @@ public class FragmentDialogTheme extends FragmentDialogBase {
editor.remove("highlight_color");
switch (rgTheme.getCheckedRadioButtonId()) {
case R.id.rbThemeBlueOrange:
int checkedRadioButtonId = rgTheme.getCheckedRadioButtonId();
if (checkedRadioButtonId == R.id.rbThemeBlueOrange) {
if (system)
editor.putString("theme",
(reverse ? "orange_blue_system" : "blue_orange_system") +
@ -198,8 +198,7 @@ public class FragmentDialogTheme extends FragmentDialogBase {
editor.putString("theme",
(reverse ? "orange_blue" : "blue_orange") +
(black ? "_black" : dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeRedGreen:
} else if (checkedRadioButtonId == R.id.rbThemeRedGreen) {
if (system)
editor.putString("theme",
(reverse ? "green_red_system" : "red_green_system") +
@ -208,8 +207,7 @@ public class FragmentDialogTheme extends FragmentDialogBase {
editor.putString("theme",
(reverse ? "green_red" : "red_green") +
(black ? "_black" : dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeYellowPurple:
} else if (checkedRadioButtonId == R.id.rbThemeYellowPurple) {
if (system)
editor.putString("theme",
(reverse ? "purple_yellow_system" : "yellow_purple_system") +
@ -218,20 +216,16 @@ public class FragmentDialogTheme extends FragmentDialogBase {
editor.putString("theme",
(reverse ? "purple_yellow" : "yellow_purple") +
(black ? "_black" : dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeGrey:
} else if (checkedRadioButtonId == R.id.rbThemeGrey) {
if (system)
editor.putString("theme", "grey_system").apply();
else
editor.putString("theme",
"grey" + (dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeBlack:
} else if (checkedRadioButtonId == R.id.rbThemeBlack) {
editor.putString("theme", "black").apply();
break;
case R.id.rbThemeBlackAndWhite:
} else if (checkedRadioButtonId == R.id.rbThemeBlackAndWhite) {
editor.putString("theme", "black_and_white").apply();
break;
}
editor.apply();

@ -409,13 +409,11 @@ public class FragmentFolder extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_delete:
if (item.getItemId() == R.id.menu_delete) {
onMenuDelete();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDelete() {

@ -468,37 +468,36 @@ public class FragmentFolders extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_search:
int itemId = item.getItemId();
if (itemId == R.id.menu_search) {
onMenuSearch();
return true;
case R.id.menu_unified:
} else if (itemId == R.id.menu_unified) {
onMenuUnified();
return true;
case R.id.menu_theme:
} else if (itemId == R.id.menu_theme) {
onMenuTheme();
return true;
case R.id.menu_compact:
} else if (itemId == R.id.menu_compact) {
onMenuCompact();
return true;
case R.id.menu_show_hidden:
} else if (itemId == R.id.menu_show_hidden) {
onMenuShowHidden();
return true;
case R.id.menu_show_flagged:
} else if (itemId == R.id.menu_show_flagged) {
onMenuShowFlagged();
return true;
case R.id.menu_subscribed_only:
} else if (itemId == R.id.menu_subscribed_only) {
onMenuSubscribedOnly();
return true;
case R.id.menu_apply_all:
} else if (itemId == R.id.menu_apply_all) {
onMenuApplyToAll();
return true;
case R.id.menu_force_sync:
} else if (itemId == R.id.menu_force_sync) {
onMenuForceSync();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuSearch() {

@ -182,13 +182,11 @@ public class FragmentGmail extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuHelp() {

@ -1230,13 +1230,11 @@ public class FragmentIdentity extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_delete:
if (item.getItemId() == R.id.menu_delete) {
onMenuDelete();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDelete() {

@ -112,19 +112,16 @@ public class FragmentLogs extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_auto_scroll:
int itemId = item.getItemId();
if (itemId == R.id.menu_auto_scroll) {
autoScroll = !item.isChecked();
item.setChecked(autoScroll);
return true;
case R.id.menu_clear:
} else if (itemId == R.id.menu_clear) {
onMenuClear();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuClear() {

@ -797,33 +797,27 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
ActionData data = (ActionData) bottom_navigation.getTag();
switch (menuItem.getItemId()) {
case R.id.action_delete:
int itemId = menuItem.getItemId();
if (itemId == R.id.action_delete) {
if (data.delete)
onActionDelete();
else
onActionMove(EntityFolder.TRASH);
return true;
case R.id.action_snooze:
} else if (itemId == R.id.action_snooze) {
onActionSnooze();
return true;
case R.id.action_archive:
} else if (itemId == R.id.action_archive) {
onActionMove(EntityFolder.ARCHIVE);
return true;
case R.id.action_prev:
} else if (itemId == R.id.action_prev) {
navigate(prev, true);
return true;
case R.id.action_next:
} else if (itemId == R.id.action_next) {
navigate(next, false);
return true;
default:
return false;
}
return false;
}
private void onActionMove(String folderType) {
@ -2176,41 +2170,39 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem target) {
switch (target.getItemId()) {
case R.string.title_seen:
int itemId = target.getItemId();
if (itemId == R.string.title_seen) {
onActionSeenSelection(true, message.id);
return true;
case R.string.title_unseen:
} else if (itemId == R.string.title_unseen) {
onActionSeenSelection(false, message.id);
return true;
case R.string.title_flag:
} else if (itemId == R.string.title_flag) {
onActionFlagSelection(true, null, message.id);
return true;
case R.string.title_unflag:
} else if (itemId == R.string.title_unflag) {
onActionFlagSelection(false, null, message.id);
return true;
case R.string.title_snooze:
} else if (itemId == R.string.title_snooze) {
onMenuSnooze();
return true;
case R.string.title_hide:
case R.string.title_unhide:
} else if (itemId == R.string.title_hide || itemId == R.string.title_unhide) {
onActionHide(message);
return true;
case R.string.title_flag_color:
} else if (itemId == R.string.title_flag_color) {
onMenuColor();
return true;
case R.string.title_move:
} else if (itemId == R.string.title_move) {
onSwipeMove(message);
return true;
case R.string.title_report_spam:
} else if (itemId == R.string.title_report_spam) {
onSwipeJunk(message);
return true;
case R.string.title_delete_permanently:
} else if (itemId == R.string.title_delete_permanently) {
onSwipeDelete(message);
return true;
default:
return false;
}
return false;
}
private void onMenuSnooze() {
@ -2467,37 +2459,36 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
return true;
}
switch (target.getItemId()) {
case R.id.menu_reply_to_sender:
int itemId = target.getItemId();
if (itemId == R.id.menu_reply_to_sender) {
onMenuReply(message, "reply", selected);
return true;
case R.id.menu_reply_to_all:
} else if (itemId == R.id.menu_reply_to_all) {
onMenuReply(message, "reply_all", selected);
return true;
case R.id.menu_reply_list:
} else if (itemId == R.id.menu_reply_list) {
onMenuReply(message, "list", selected);
return true;
case R.id.menu_reply_receipt:
} else if (itemId == R.id.menu_reply_receipt) {
onMenuDsn(message, EntityMessage.DSN_RECEIPT);
return true;
case R.id.menu_reply_hard_bounce:
} else if (itemId == R.id.menu_reply_hard_bounce) {
onMenuDsn(message, EntityMessage.DSN_HARD_BOUNCE);
return true;
case R.id.menu_forward:
} else if (itemId == R.id.menu_forward) {
onMenuReply(message, "forward");
return true;
case R.id.menu_editasnew:
} else if (itemId == R.id.menu_editasnew) {
onMenuReply(message, "editasnew");
return true;
case R.id.menu_new_message:
} else if (itemId == R.id.menu_new_message) {
onMenuNew(message, to);
return true;
case R.id.menu_reply_answer:
} else if (itemId == R.id.menu_reply_answer) {
onMenuAnswer(message);
return true;
default:
return false;
}
return false;
}
});
popupMenu.show();
@ -2864,65 +2855,64 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem target) {
switch (target.getItemId()) {
case R.string.title_seen:
int itemId = target.getItemId();
if (itemId == R.string.title_seen) {
onActionSeenSelection(true, null);
return true;
case R.string.title_unseen:
} else if (itemId == R.string.title_unseen) {
onActionSeenSelection(false, null);
return true;
case R.string.title_snooze:
} else if (itemId == R.string.title_snooze) {
onActionSnoozeSelection();
return true;
case R.string.title_hide:
} else if (itemId == R.string.title_hide) {
onHideSelection(true);
return true;
case R.string.title_unhide:
} else if (itemId == R.string.title_unhide) {
onHideSelection(false);
return true;
case R.string.title_flag:
} else if (itemId == R.string.title_flag) {
onActionFlagSelection(true, null, null);
return true;
case R.string.title_unflag:
} else if (itemId == R.string.title_unflag) {
onActionFlagSelection(false, null, null);
return true;
case R.string.title_flag_color:
} else if (itemId == R.string.title_flag_color) {
onActionFlagColorSelection();
return true;
case R.string.title_importance_low:
} else if (itemId == R.string.title_importance_low) {
onActionSetImportanceSelection(EntityMessage.PRIORITIY_LOW);
return true;
case R.string.title_importance_normal:
} else if (itemId == R.string.title_importance_normal) {
onActionSetImportanceSelection(EntityMessage.PRIORITIY_NORMAL);
return true;
case R.string.title_importance_high:
} else if (itemId == R.string.title_importance_high) {
onActionSetImportanceSelection(EntityMessage.PRIORITIY_HIGH);
return true;
case R.string.title_folder_inbox:
} else if (itemId == R.string.title_folder_inbox) {
onActionMoveSelection(EntityFolder.INBOX);
return true;
case R.string.title_archive:
} else if (itemId == R.string.title_archive) {
onActionMoveSelection(EntityFolder.ARCHIVE);
return true;
case R.string.title_delete:
} else if (itemId == R.string.title_delete) {
onActionDeleteSelection();
return true;
case R.string.title_trash:
} else if (itemId == R.string.title_trash) {
onActionMoveSelection(EntityFolder.TRASH);
return true;
case R.string.title_spam:
} else if (itemId == R.string.title_spam) {
onActionJunkSelection();
return true;
case R.string.title_move_to_account:
} else if (itemId == R.string.title_move_to_account) {
long account = target.getIntent().getLongExtra("account", -1);
onActionMoveSelectionAccount(account, false, result.folders);
return true;
case R.string.title_copy_to:
} else if (itemId == R.string.title_copy_to) {
onActionMoveSelectionAccount(result.copyto.id, true, result.folders);
return true;
default:
return false;
}
return false;
}
});
@ -4128,129 +4118,99 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_search:
int itemId = item.getItemId();
if (itemId == R.id.menu_search) {
onMenuSearch();
return true;
case R.id.menu_folders:
// Obsolete
} else if (itemId == R.id.menu_folders) {// Obsolete
onMenuFolders(primary);
return true;
case R.id.menu_empty_trash:
} else if (itemId == R.id.menu_empty_trash) {
onMenuEmpty(EntityFolder.TRASH);
return true;
case R.id.menu_empty_spam:
} else if (itemId == R.id.menu_empty_spam) {
onMenuEmpty(EntityFolder.JUNK);
return true;
case R.id.menu_sort_on_time:
} else if (itemId == R.id.menu_sort_on_time) {
item.setChecked(true);
onMenuSort("time");
return true;
case R.id.menu_sort_on_unread:
} else if (itemId == R.id.menu_sort_on_unread) {
item.setChecked(true);
onMenuSort("unread");
return true;
case R.id.menu_sort_on_starred:
} else if (itemId == R.id.menu_sort_on_starred) {
item.setChecked(true);
onMenuSort("starred");
return true;
case R.id.menu_sort_on_priority:
} else if (itemId == R.id.menu_sort_on_priority) {
item.setChecked(true);
onMenuSort("priority");
return true;
case R.id.menu_sort_on_sender:
} else if (itemId == R.id.menu_sort_on_sender) {
item.setChecked(true);
onMenuSort("sender");
return true;
case R.id.menu_sort_on_subject:
} else if (itemId == R.id.menu_sort_on_subject) {
item.setChecked(true);
onMenuSort("subject");
return true;
case R.id.menu_sort_on_size:
} else if (itemId == R.id.menu_sort_on_size) {
item.setChecked(true);
onMenuSort("size");
return true;
case R.id.menu_sort_on_attachments:
} else if (itemId == R.id.menu_sort_on_attachments) {
item.setChecked(true);
onMenuSort("attachments");
return true;
case R.id.menu_sort_on_snoozed:
} else if (itemId == R.id.menu_sort_on_snoozed) {
item.setChecked(true);
onMenuSort("snoozed");
return true;
case R.id.menu_ascending:
} else if (itemId == R.id.menu_ascending) {
onMenuAscending(!item.isChecked());
return true;
case R.id.menu_filter_seen:
} else if (itemId == R.id.menu_filter_seen) {
onMenuFilter("filter_seen", !item.isChecked());
return true;
case R.id.menu_filter_unflagged:
} else if (itemId == R.id.menu_filter_unflagged) {
onMenuFilter("filter_unflagged", !item.isChecked());
return true;
case R.id.menu_filter_unknown:
} else if (itemId == R.id.menu_filter_unknown) {
onMenuFilter("filter_unknown", !item.isChecked());
return true;
case R.id.menu_filter_snoozed:
} else if (itemId == R.id.menu_filter_snoozed) {
onMenuFilter("filter_snoozed", !item.isChecked());
return true;
case R.id.menu_filter_duplicates:
} else if (itemId == R.id.menu_filter_duplicates) {
onMenuFilterDuplicates(!item.isChecked());
return true;
case R.id.menu_zoom:
} else if (itemId == R.id.menu_zoom) {
onMenuZoom();
return true;
case R.id.menu_compact:
} else if (itemId == R.id.menu_compact) {
onMenuCompact();
return true;
case R.id.menu_theme:
} else if (itemId == R.id.menu_theme) {
onMenuTheme();
return true;
case R.id.menu_select_language:
} else if (itemId == R.id.menu_select_language) {
onMenuSelectLanguage();
return true;
case R.id.menu_select_all:
case R.id.menu_select_found:
} else if (itemId == R.id.menu_select_all || itemId == R.id.menu_select_found) {
onMenuSelectAll();
return true;
case R.id.menu_mark_all_read:
} else if (itemId == R.id.menu_mark_all_read) {
onMenuMarkAllRead();
return true;
case R.id.menu_force_sync:
} else if (itemId == R.id.menu_force_sync) {
onMenuForceSync();
return true;
case R.id.menu_force_send:
} else if (itemId == R.id.menu_force_send) {
onSwipeRefresh();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuSearch() {

@ -179,13 +179,11 @@ public class FragmentOAuth extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuHelp() {

@ -111,17 +111,15 @@ public class FragmentOperations extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
int itemId = item.getItemId();
if (itemId == R.id.menu_help) {
onMenuHelp();
return true;
case R.id.menu_delete:
} else if (itemId == R.id.menu_delete) {
new FragmentDialogDelete().show(getParentFragmentManager(), "operations:delete");
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuHelp() {

@ -412,13 +412,11 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDefault() {

@ -275,13 +275,11 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDefault() {

@ -848,13 +848,11 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDefault() {

@ -347,13 +347,11 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDefault() {

@ -743,13 +743,11 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDefault() {

@ -502,13 +502,11 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDefault() {

@ -349,13 +349,11 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDefault() {

@ -379,13 +379,11 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDefault() {

@ -368,13 +368,11 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDefault() {

@ -165,13 +165,11 @@ public class FragmentOrder extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_reset_order:
if (item.getItemId() == R.id.menu_reset_order) {
onMenuResetOrder();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuResetOrder() {

@ -714,13 +714,11 @@ public class FragmentPop extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_delete:
if (item.getItemId() == R.id.menu_delete) {
onMenuDelete();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuDelete() {

@ -252,13 +252,11 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_response:
if (item.getItemId() == R.id.menu_response) {
onMenuResponse();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuResponse() {

@ -206,13 +206,11 @@ public class FragmentQuickSetup extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuHelp() {

@ -495,19 +495,18 @@ public class FragmentRule extends FragmentBase {
bottom_navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
switch (menuItem.getItemId()) {
case R.id.action_delete:
int itemId = menuItem.getItemId();
if (itemId == R.id.action_delete) {
onActionDelete();
return true;
case R.id.action_check:
} else if (itemId == R.id.action_check) {
onActionCheck();
return true;
case R.id.action_save:
} else if (itemId == R.id.action_save) {
onActionSave();
return true;
default:
return false;
}
return false;
}
});
@ -603,14 +602,11 @@ public class FragmentRule extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuHelp() {

@ -259,22 +259,21 @@ public class FragmentRules extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_export:
int itemId = item.getItemId();
if (itemId == R.id.menu_export) {
onMenuExport();
return true;
case R.id.menu_import:
} else if (itemId == R.id.menu_import) {
onMenuImport();
return true;
case R.id.menu_delete_all:
} else if (itemId == R.id.menu_delete_all) {
onMenuDelete(true);
return true;
case R.id.menu_delete_junk:
} else if (itemId == R.id.menu_delete_junk) {
onMenuDelete(false);
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
private void onMenuExport() {

@ -172,24 +172,23 @@ public class FragmentSetup extends FragmentBase {
@Override
public boolean onMenuItemClick(MenuItem item) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
switch (item.getItemId()) {
case R.string.title_setup_gmail:
int itemId = item.getItemId();
if (itemId == R.string.title_setup_gmail) {
if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG)
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_GMAIL));
else
ToastEx.makeText(getContext(), R.string.title_setup_gmail_support, Toast.LENGTH_LONG).show();
return true;
case R.string.title_setup_activesync:
} else if (itemId == R.string.title_setup_activesync) {
Helper.viewFAQ(getContext(), 133);
return true;
case R.string.title_setup_outlook:
case R.string.title_setup_other:
} else if (itemId == R.string.title_setup_outlook || itemId == R.string.title_setup_other) {
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP));
return true;
case R.string.title_setup_pop3:
} else if (itemId == R.string.title_setup_pop3) {
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_POP3));
return true;
default:
}
if (item.getIntent() == null)
return false;
else {
@ -200,7 +199,6 @@ public class FragmentSetup extends FragmentBase {
return true;
}
}
}
});
popupMenu.show();

@ -84,9 +84,7 @@ public class StyleHelper {
SpannableString ss = new SpannableString(etBody.getText());
switch (action) {
case R.id.menu_bold:
case R.id.menu_italic: {
if (action == R.id.menu_bold || action == R.id.menu_italic) {
int style = (action == R.id.menu_bold ? Typeface.BOLD : Typeface.ITALIC);
boolean has = false;
for (StyleSpan span : ss.getSpans(start, end, StyleSpan.class))
@ -102,9 +100,7 @@ public class StyleHelper {
etBody.setSelection(start, end);
return true;
}
case R.id.menu_underline: {
} else if (action == R.id.menu_underline) {
boolean has = false;
for (UnderlineSpan span : ss.getSpans(start, end, UnderlineSpan.class)) {
has = true;
@ -118,9 +114,7 @@ public class StyleHelper {
etBody.setSelection(start, end);
return true;
}
case R.id.menu_style: {
} else if (action == R.id.menu_style) {
final int s = start;
final int e = end;
final SpannableStringBuilder t = new SpannableStringBuilder(ss);
@ -138,26 +132,25 @@ public class StyleHelper {
@Override
public boolean onMenuItemClick(MenuItem item) {
try {
switch (item.getGroupId()) {
case R.id.group_style_size:
int groupId = item.getGroupId();
if (groupId == R.id.group_style_size) {
return setSize(item);
case R.id.group_style_color:
} else if (groupId == R.id.group_style_color) {
return setColor(item);
case R.id.group_style_align:
} else if (groupId == R.id.group_style_align) {
return setAlignment(item);
case R.id.group_style_list:
} else if (groupId == R.id.group_style_list) {
return setList(item);
case R.id.group_style_font:
} else if (groupId == R.id.group_style_font) {
return setFont(item);
case R.id.group_style_blockquote:
} else if (groupId == R.id.group_style_blockquote) {
return setBlockQuote(item);
case R.id.group_style_strikethrough:
} else if (groupId == R.id.group_style_strikethrough) {
return setStrikeThrough(item);
case R.id.group_style_clear:
} else if (groupId == R.id.group_style_clear) {
return clear(item);
default:
return false;
}
return false;
} catch (Throwable ex) {
Log.e(ex);
return false;
@ -242,16 +235,13 @@ public class StyleHelper {
Layout.Alignment alignment = null;
boolean ltr = (TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_LTR);
switch (item.getItemId()) {
case R.id.menu_style_align_start:
int itemId = item.getItemId();
if (itemId == R.id.menu_style_align_start) {
alignment = (ltr ? Layout.Alignment.ALIGN_NORMAL : Layout.Alignment.ALIGN_OPPOSITE);
break;
case R.id.menu_style_align_center:
} else if (itemId == R.id.menu_style_align_center) {
alignment = Layout.Alignment.ALIGN_CENTER;
break;
case R.id.menu_style_align_end:
} else if (itemId == R.id.menu_style_align_end) {
alignment = (ltr ? Layout.Alignment.ALIGN_OPPOSITE : Layout.Alignment.ALIGN_NORMAL);
break;
}
if (alignment != null)
@ -402,9 +392,7 @@ public class StyleHelper {
popupMenu.show();
return true;
}
case R.id.menu_link: {
} else if (action == R.id.menu_link) {
String url = (String) args[0];
List<Object> spans = new ArrayList<>();
@ -432,9 +420,7 @@ public class StyleHelper {
etBody.setSelection(end, end);
return true;
}
case R.id.menu_clear: {
} else if (action == R.id.menu_clear) {
for (Object span : ss.getSpans(0, etBody.length(), Object.class))
if (!(span instanceof ImageSpan))
ss.removeSpan(span);
@ -444,10 +430,7 @@ public class StyleHelper {
return true;
}
default:
return false;
}
} catch (Throwable ex) {
Log.e(ex);
return false;

Loading…
Cancel
Save