msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Replaced resource ID switches by ifs

Browse Source
pull/194/head
M66B 5 years ago
parent b8662875f9
commit 3e41dd2e49
45 changed files with 1340 additions and 1610 deletions
Show Stats Download Patch File Download Diff File

12
app/src/main/java/eu/faircode/email/ActivityBase.java
Unescape View File

@ -673,14 +673,12 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
@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: if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) onBackPressed();
onBackPressed(); return true;
return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
protected boolean backHandled() { protected boolean backHandled() {

10
app/src/main/java/eu/faircode/email/ActivityEML.java
Unescape View File

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

36
app/src/main/java/eu/faircode/email/ActivitySignature.java
Unescape View File

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

33
app/src/main/java/eu/faircode/email/AdapterAccount.java
Unescape View File

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

26
app/src/main/java/eu/faircode/email/AdapterAnswer.java
Unescape View File

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

11
app/src/main/java/eu/faircode/email/AdapterCertificate.java
Unescape View File

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

35
app/src/main/java/eu/faircode/email/AdapterContact.java
Unescape View File

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

223
app/src/main/java/eu/faircode/email/AdapterFolder.java
Unescape View File

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

33
app/src/main/java/eu/faircode/email/AdapterIdentity.java
Unescape View File

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

559
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/AdapterOperation.java
Unescape View File

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

40
app/src/main/java/eu/faircode/email/AdapterRule.java
Unescape View File

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

17
app/src/main/java/eu/faircode/email/FragmentAbout.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

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

46
app/src/main/java/eu/faircode/email/FragmentAccounts.java
Unescape View File

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

33
app/src/main/java/eu/faircode/email/FragmentAnswer.java
Unescape View File

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

231
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

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

17
app/src/main/java/eu/faircode/email/FragmentContacts.java
Unescape View File

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

24
app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
Unescape View File

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

82
app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentFolder.java
Unescape View File

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

59
app/src/main/java/eu/faircode/email/FragmentFolders.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentGmail.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentIdentity.java
Unescape View File

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

21
app/src/main/java/eu/faircode/email/FragmentLogs.java
Unescape View File

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

500
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOAuth.java
Unescape View File

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

18
app/src/main/java/eu/faircode/email/FragmentOperations.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentOrder.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentPop.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentPro.java
Unescape View File

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

10
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
Unescape View File

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

34
app/src/main/java/eu/faircode/email/FragmentRule.java
Unescape View File

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

29
app/src/main/java/eu/faircode/email/FragmentRules.java
Unescape View File

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

52
app/src/main/java/eu/faircode/email/FragmentSetup.java
Unescape View File

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

579
app/src/main/java/eu/faircode/email/StyleHelper.java
Unescape View File

@ -84,370 +84,353 @@ public class StyleHelper {
SpannableString ss = new SpannableString(etBody.getText()); SpannableString ss = new SpannableString(etBody.getText());
switch (action) { if (action == R.id.menu_bold || action == R.id.menu_italic) {
case R.id.menu_bold: int style = (action == R.id.menu_bold ? Typeface.BOLD : Typeface.ITALIC);
case R.id.menu_italic: { boolean has = false;
int style = (action == R.id.menu_bold ? Typeface.BOLD : Typeface.ITALIC); for (StyleSpan span : ss.getSpans(start, end, StyleSpan.class))
boolean has = false; if (span.getStyle() == style) {
for (StyleSpan span : ss.getSpans(start, end, StyleSpan.class))
if (span.getStyle() == style) {
has = true;
ss.removeSpan(span);
}
if (!has)
ss.setSpan(new StyleSpan(style), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(ss);
etBody.setSelection(start, end);
return true;
}
case R.id.menu_underline: {
boolean has = false;
for (UnderlineSpan span : ss.getSpans(start, end, UnderlineSpan.class)) {
has = true; has = true;
ss.removeSpan(span); ss.removeSpan(span);
} }
if (!has) if (!has)
ss.setSpan(new UnderlineSpan(), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); ss.setSpan(new StyleSpan(style), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(ss); etBody.setText(ss);
etBody.setSelection(start, end); etBody.setSelection(start, end);
return true; return true;
} else if (action == R.id.menu_underline) {
boolean has = false;
for (UnderlineSpan span : ss.getSpans(start, end, UnderlineSpan.class)) {
has = true;
ss.removeSpan(span);
} }
case R.id.menu_style: { if (!has)
final int s = start; ss.setSpan(new UnderlineSpan(), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
final int e = end;
final SpannableStringBuilder t = new SpannableStringBuilder(ss); etBody.setText(ss);
etBody.setSelection(start, end);
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(anchor.getContext(), owner, anchor);
popupMenu.inflate(R.menu.popup_style); return true;
} else if (action == R.id.menu_style) {
String[] fontNames = anchor.getResources().getStringArray(R.array.fontNameNames); final int s = start;
SubMenu smenu = popupMenu.getMenu().findItem(R.id.menu_style_font).getSubMenu(); final int e = end;
for (int i = 0; i < fontNames.length; i++) final SpannableStringBuilder t = new SpannableStringBuilder(ss);
smenu.add(R.id.group_style_font, i, 0, fontNames[i]);
smenu.add(R.id.group_style_font, fontNames.length, 0, R.string.title_style_font_default); PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(anchor.getContext(), owner, anchor);
popupMenu.inflate(R.menu.popup_style);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override String[] fontNames = anchor.getResources().getStringArray(R.array.fontNameNames);
public boolean onMenuItemClick(MenuItem item) { SubMenu smenu = popupMenu.getMenu().findItem(R.id.menu_style_font).getSubMenu();
try { for (int i = 0; i < fontNames.length; i++)
switch (item.getGroupId()) { smenu.add(R.id.group_style_font, i, 0, fontNames[i]);
case R.id.group_style_size: smenu.add(R.id.group_style_font, fontNames.length, 0, R.string.title_style_font_default);
return setSize(item);
case R.id.group_style_color: popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
return setColor(item); @Override
case R.id.group_style_align: public boolean onMenuItemClick(MenuItem item) {
return setAlignment(item); try {
case R.id.group_style_list: int groupId = item.getGroupId();
return setList(item); if (groupId == R.id.group_style_size) {
case R.id.group_style_font: return setSize(item);
return setFont(item); } else if (groupId == R.id.group_style_color) {
case R.id.group_style_blockquote: return setColor(item);
return setBlockQuote(item); } else if (groupId == R.id.group_style_align) {
case R.id.group_style_strikethrough: return setAlignment(item);
return setStrikeThrough(item); } else if (groupId == R.id.group_style_list) {
case R.id.group_style_clear: return setList(item);
return clear(item); } else if (groupId == R.id.group_style_font) {
default: return setFont(item);
return false; } else if (groupId == R.id.group_style_blockquote) {
} return setBlockQuote(item);
} catch (Throwable ex) { } else if (groupId == R.id.group_style_strikethrough) {
Log.e(ex); return setStrikeThrough(item);
return false; } else if (groupId == R.id.group_style_clear) {
return clear(item);
} }
return false;
} catch (Throwable ex) {
Log.e(ex);
return false;
} }
}
private boolean setSize(MenuItem item) { private boolean setSize(MenuItem item) {
RelativeSizeSpan[] spans = t.getSpans(s, e, RelativeSizeSpan.class); RelativeSizeSpan[] spans = t.getSpans(s, e, RelativeSizeSpan.class);
for (RelativeSizeSpan span : spans) for (RelativeSizeSpan span : spans)
t.removeSpan(span); t.removeSpan(span);
Float size;
if (item.getItemId() == R.id.menu_style_size_small)
size = 0.8f;
else if (item.getItemId() == R.id.menu_style_size_large)
size = 1.25f;
else
size = null;
if (size != null)
t.setSpan(new RelativeSizeSpan(size), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(t);
etBody.setSelection(s, e);
return true;
}
private boolean setColor(MenuItem item) {
InputMethodManager imm = (InputMethodManager) etBody.getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
if (imm != null)
imm.hideSoftInputFromWindow(etBody.getWindowToken(), 0);
Context context = etBody.getContext();
int editTextColor = Helper.resolveColor(context, android.R.attr.editTextColor);
ColorPickerDialogBuilder builder = ColorPickerDialogBuilder
.with(context)
.setTitle(R.string.title_color)
.showColorEdit(true)
.setColorEditTextColor(editTextColor)
.wheelType(ColorPickerView.WHEEL_TYPE.FLOWER)
.density(6)
.lightnessSliderOnly()
.setPositiveButton(android.R.string.ok, new ColorPickerClickListener() {
@Override
public void onClick(DialogInterface dialog, int selectedColor, Integer[] allColors) {
_setColor(selectedColor);
}
})
.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
_setColor(null);
}
});
builder.build().show();
return true;
}
private void _setColor(Integer color) { Float size;
for (ForegroundColorSpan span : t.getSpans(s, e, ForegroundColorSpan.class)) if (item.getItemId() == R.id.menu_style_size_small)
t.removeSpan(span); size = 0.8f;
else if (item.getItemId() == R.id.menu_style_size_large)
size = 1.25f;
else
size = null;
if (color != null) if (size != null)
t.setSpan(new ForegroundColorSpan(color), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); t.setSpan(new RelativeSizeSpan(size), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(t); etBody.setText(t);
etBody.setSelection(s, e); etBody.setSelection(s, e);
}
private boolean setAlignment(MenuItem item) { return true;
Pair<Integer, Integer> paragraph = ensureParagraph(t, s, e); }
int start = paragraph.first;
int end = paragraph.second;
AlignmentSpan[] spans = t.getSpans(start, end, AlignmentSpan.class); private boolean setColor(MenuItem item) {
for (AlignmentSpan span : spans) InputMethodManager imm = (InputMethodManager) etBody.getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
t.removeSpan(span); if (imm != null)
imm.hideSoftInputFromWindow(etBody.getWindowToken(), 0);
Context context = etBody.getContext();
int editTextColor = Helper.resolveColor(context, android.R.attr.editTextColor);
ColorPickerDialogBuilder builder = ColorPickerDialogBuilder
.with(context)
.setTitle(R.string.title_color)
.showColorEdit(true)
.setColorEditTextColor(editTextColor)
.wheelType(ColorPickerView.WHEEL_TYPE.FLOWER)
.density(6)
.lightnessSliderOnly()
.setPositiveButton(android.R.string.ok, new ColorPickerClickListener() {
@Override
public void onClick(DialogInterface dialog, int selectedColor, Integer[] allColors) {
_setColor(selectedColor);
}
})
.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
_setColor(null);
}
});
builder.build().show();
return true;
}
Layout.Alignment alignment = null; private void _setColor(Integer color) {
boolean ltr = (TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_LTR); for (ForegroundColorSpan span : t.getSpans(s, e, ForegroundColorSpan.class))
switch (item.getItemId()) { t.removeSpan(span);
case R.id.menu_style_align_start:
alignment = (ltr ? Layout.Alignment.ALIGN_NORMAL : Layout.Alignment.ALIGN_OPPOSITE);
break;
case R.id.menu_style_align_center:
alignment = Layout.Alignment.ALIGN_CENTER;
break;
case R.id.menu_style_align_end:
alignment = (ltr ? Layout.Alignment.ALIGN_OPPOSITE : Layout.Alignment.ALIGN_NORMAL);
break;
}
if (alignment != null) if (color != null)
t.setSpan(new AlignmentSpan.Standard(alignment), t.setSpan(new ForegroundColorSpan(color), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
etBody.setText(t); etBody.setText(t);
etBody.setSelection(start, end); etBody.setSelection(s, e);
}
return true; private boolean setAlignment(MenuItem item) {
Pair<Integer, Integer> paragraph = ensureParagraph(t, s, e);
int start = paragraph.first;
int end = paragraph.second;
AlignmentSpan[] spans = t.getSpans(start, end, AlignmentSpan.class);
for (AlignmentSpan span : spans)
t.removeSpan(span);
Layout.Alignment alignment = null;
boolean ltr = (TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_LTR);
int itemId = item.getItemId();
if (itemId == R.id.menu_style_align_start) {
alignment = (ltr ? Layout.Alignment.ALIGN_NORMAL : Layout.Alignment.ALIGN_OPPOSITE);
} else if (itemId == R.id.menu_style_align_center) {
alignment = Layout.Alignment.ALIGN_CENTER;
} else if (itemId == R.id.menu_style_align_end) {
alignment = (ltr ? Layout.Alignment.ALIGN_OPPOSITE : Layout.Alignment.ALIGN_NORMAL);
} }
private boolean setList(MenuItem item) { if (alignment != null)
Context context = etBody.getContext(); t.setSpan(new AlignmentSpan.Standard(alignment),
start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
int colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
int dp3 = Helper.dp2pixels(context, 3);
int dp6 = Helper.dp2pixels(context, 6);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int message_zoom = prefs.getInt("message_zoom", 100);
float textSize = Helper.getTextSize(context, 0) * message_zoom / 100f;
Pair<Integer, Integer> paragraph = ensureParagraph(t, s, e); etBody.setText(t);
int start = paragraph.first; etBody.setSelection(start, end);
int end = paragraph.second;
// Remove existing bullets return true;
BulletSpan[] spans = t.getSpans(start, end, BulletSpan.class); }
for (BulletSpan span : spans)
t.removeSpan(span);
int i = start; private boolean setList(MenuItem item) {
int j = start + 1; Context context = etBody.getContext();
int index = 1;
while (j < end) { int colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
if (i > 0 && t.charAt(i - 1) == '\n' && t.charAt(j) == '\n') { int dp3 = Helper.dp2pixels(context, 3);
Log.i("Insert " + i + "..." + (j + 1) + " size=" + end); int dp6 = Helper.dp2pixels(context, 6);
if (item.getItemId() == R.id.menu_style_list_bullets)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
t.setSpan(new BulletSpan(dp6, colorAccent), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); int message_zoom = prefs.getInt("message_zoom", 100);
else float textSize = Helper.getTextSize(context, 0) * message_zoom / 100f;
t.setSpan(new BulletSpan(dp6, colorAccent, dp3), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
Pair<Integer, Integer> paragraph = ensureParagraph(t, s, e);
int start = paragraph.first;
int end = paragraph.second;
// Remove existing bullets
BulletSpan[] spans = t.getSpans(start, end, BulletSpan.class);
for (BulletSpan span : spans)
t.removeSpan(span);
int i = start;
int j = start + 1;
int index = 1;
while (j < end) {
if (i > 0 && t.charAt(i - 1) == '\n' && t.charAt(j) == '\n') {
Log.i("Insert " + i + "..." + (j + 1) + " size=" + end);
if (item.getItemId() == R.id.menu_style_list_bullets)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
t.setSpan(new BulletSpan(dp6, colorAccent), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
else else
t.setSpan(new NumberSpan(dp6, colorAccent, textSize, index++), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); t.setSpan(new BulletSpan(dp6, colorAccent, dp3), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
else
t.setSpan(new NumberSpan(dp6, colorAccent, textSize, index++), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
i = j + 1; i = j + 1;
}
j++;
} }
j++;
etBody.setText(t);
etBody.setSelection(start, end);
return true;
} }
private boolean setFont(MenuItem item) { etBody.setText(t);
TypefaceSpan[] spans = t.getSpans(s, e, TypefaceSpan.class); etBody.setSelection(start, end);
for (TypefaceSpan span : spans)
t.removeSpan(span);
int id = item.getItemId(); return true;
String[] names = anchor.getResources().getStringArray(R.array.fontNameValues); }
String face = (id < names.length ? names[id] : null);
if (face != null) private boolean setFont(MenuItem item) {
t.setSpan(new TypefaceSpan(face), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); TypefaceSpan[] spans = t.getSpans(s, e, TypefaceSpan.class);
for (TypefaceSpan span : spans)
t.removeSpan(span);
etBody.setText(t); int id = item.getItemId();
etBody.setSelection(s, e); String[] names = anchor.getResources().getStringArray(R.array.fontNameValues);
String face = (id < names.length ? names[id] : null);
return true; if (face != null)
} t.setSpan(new TypefaceSpan(face), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
private boolean setBlockQuote(MenuItem item) { etBody.setText(t);
Context context = etBody.getContext(); etBody.setSelection(s, e);
int colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary); return true;
int dp3 = Helper.dp2pixels(context, 3); }
int dp6 = Helper.dp2pixels(context, 6);
Pair<Integer, Integer> paragraph = ensureParagraph(t, s, e);
int start = paragraph.first;
int end = paragraph.second;
QuoteSpan[] spans = t.getSpans(s, e, QuoteSpan.class); private boolean setBlockQuote(MenuItem item) {
for (QuoteSpan span : spans) Context context = etBody.getContext();
t.removeSpan(span);
QuoteSpan q; int colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) int dp3 = Helper.dp2pixels(context, 3);
q = new QuoteSpan(colorPrimary); int dp6 = Helper.dp2pixels(context, 6);
else
q = new QuoteSpan(colorPrimary, dp3, dp6);
t.setSpan(q, start, end, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
etBody.setText(t); Pair<Integer, Integer> paragraph = ensureParagraph(t, s, e);
etBody.setSelection(start, end); int start = paragraph.first;
int end = paragraph.second;
return true; QuoteSpan[] spans = t.getSpans(s, e, QuoteSpan.class);
} for (QuoteSpan span : spans)
t.removeSpan(span);
private boolean setStrikeThrough(MenuItem item) { QuoteSpan q;
boolean has = false; if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
for (StrikethroughSpan span : t.getSpans(s, e, StrikethroughSpan.class)) { q = new QuoteSpan(colorPrimary);
has = true; else
t.removeSpan(span); q = new QuoteSpan(colorPrimary, dp3, dp6);
} t.setSpan(q, start, end, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
if (!has) etBody.setText(t);
t.setSpan(new StrikethroughSpan(), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); etBody.setSelection(start, end);
etBody.setText(t); return true;
etBody.setSelection(s, e); }
return true; private boolean setStrikeThrough(MenuItem item) {
boolean has = false;
for (StrikethroughSpan span : t.getSpans(s, e, StrikethroughSpan.class)) {
has = true;
t.removeSpan(span);
} }
private boolean clear(MenuItem item) { if (!has)
int start = s; t.setSpan(new StrikethroughSpan(), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
int end = e;
// Expand to paragraph (block quotes) etBody.setText(t);
if (end + 1 < t.length() && t.charAt(end) == '\n') etBody.setSelection(s, e);
end++;
for (Object span : t.getSpans(start, end, Object.class)) return true;
if (!(span instanceof ImageSpan)) { }
int sstart = t.getSpanStart(span);
int send = t.getSpanEnd(span);
int flags = t.getSpanFlags(span);
if (sstart < start && send > start)
setSpan(t, span, sstart, start, flags, etBody.getContext());
if (sstart < end && send > end)
setSpan(t, span, end, send, flags, etBody.getContext());
t.removeSpan(span); private boolean clear(MenuItem item) {
} int start = s;
int end = e;
etBody.setText(t); // Expand to paragraph (block quotes)
etBody.setSelection(s, e); if (end + 1 < t.length() && t.charAt(end) == '\n')
end++;
return true; for (Object span : t.getSpans(start, end, Object.class))
} if (!(span instanceof ImageSpan)) {
}); int sstart = t.getSpanStart(span);
int send = t.getSpanEnd(span);
int flags = t.getSpanFlags(span);
if (sstart < start && send > start)
setSpan(t, span, sstart, start, flags, etBody.getContext());
if (sstart < end && send > end)
setSpan(t, span, end, send, flags, etBody.getContext());
popupMenu.show(); t.removeSpan(span);
}
return true;
}
case R.id.menu_link: { etBody.setText(t);
String url = (String) args[0]; etBody.setSelection(s, e);
List<Object> spans = new ArrayList<>(); return true;
for (Object span : ss.getSpans(start, end, Object.class)) {
if (!(span instanceof URLSpan))
spans.add(span);
ss.removeSpan(span);
} }
});
if (url != null) { popupMenu.show();
if (start == end) {
etBody.getText().insert(start, url);
end += url.length();
ss = new SpannableString(etBody.getText());
}
ss.setSpan(new URLSpan(url), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); return true;
} } else if (action == R.id.menu_link) {
String url = (String) args[0];
// Restore other spans List<Object> spans = new ArrayList<>();
for (Object span : spans) for (Object span : ss.getSpans(start, end, Object.class)) {
ss.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); if (!(span instanceof URLSpan))
spans.add(span);
ss.removeSpan(span);
}
etBody.setText(ss); if (url != null) {
etBody.setSelection(end, end); if (start == end) {
etBody.getText().insert(start, url);
end += url.length();
ss = new SpannableString(etBody.getText());
}
return true; ss.setSpan(new URLSpan(url), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
case R.id.menu_clear: { // Restore other spans
for (Object span : ss.getSpans(0, etBody.length(), Object.class)) for (Object span : spans)
if (!(span instanceof ImageSpan)) ss.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
ss.removeSpan(span);
etBody.setText(ss); etBody.setText(ss);
etBody.setSelection(start, end); etBody.setSelection(end, end);
return true; return true;
} } else if (action == R.id.menu_clear) {
for (Object span : ss.getSpans(0, etBody.length(), Object.class))
if (!(span instanceof ImageSpan))
ss.removeSpan(span);
etBody.setText(ss);
etBody.setSelection(start, end);
default: return true;
return false;
} }
return false;
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
return false; return false;

Write Preview
Loading…
Cancel
Save