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
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
onBackPressed();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == android.R.id.home) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
onBackPressed();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_save:
onMenuSave();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_save) {
onMenuSave();
return true;
}
return super.onOptionsItemSelected(item);
}
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() {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.action_insert_image:
insertImage();
return true;
case R.id.action_delete:
delete();
return true;
case R.id.action_save:
save();
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.id.action_insert_image) {
insertImage();
return true;
} else if (itemId == R.id.action_delete) {
delete();
return true;
} else if (itemId == R.id.action_save) {
save();
return true;
}
return false;
}
});
@ -160,19 +159,16 @@ public class ActivitySignature extends ActivityBase {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.menu_signature, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_edit_html:
item.setChecked(!item.isChecked());
html(item.isChecked());
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_edit_html) {
item.setChecked(!item.isChecked());
html(item.isChecked());
return true;
}
return super.onOptionsItemSelected(item);
}
@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() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_enabled:
onActionSync(!item.isChecked());
return true;
case R.string.title_primary:
onActionPrimary(!item.isChecked());
return true;
case R.string.title_edit_channel:
onActionEditChannel();
return true;
case R.string.title_copy:
onActionCopy();
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_enabled) {
onActionSync(!item.isChecked());
return true;
} else if (itemId == R.string.title_primary) {
onActionPrimary(!item.isChecked());
return true;
} else if (itemId == R.string.title_edit_channel) {
onActionEditChannel();
return true;
} else if (itemId == R.string.title_copy) {
onActionCopy();
return true;
}
return false;
}
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() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_compose:
onActionCompose();
return true;
case R.string.title_answer_hide:
onActionHide(!item.isChecked());
return true;
case R.string.title_copy:
onActionCopy();
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_compose) {
onActionCompose();
return true;
} else if (itemId == R.string.title_answer_hide) {
onActionHide(!item.isChecked());
return true;
} else if (itemId == R.string.title_copy) {
onActionCopy();
return true;
}
return false;
}
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() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_delete:
onActionDelete();
return true;
default:
return false;
if (item.getItemId() == R.string.title_delete) {
onActionDelete();
return true;
}
return false;
}
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() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_advanced_never_favorite:
onActionNeverFavorite();
return true;
case R.string.title_share:
onActionShare();
return true;
case R.string.title_pin:
onActionPin();
return true;
case R.string.title_advanced_edit_name:
onActionEdit();
return true;
case R.string.title_delete:
onActionDelete();
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_advanced_never_favorite) {
onActionNeverFavorite();
return true;
} else if (itemId == R.string.title_share) {
onActionShare();
return true;
} else if (itemId == R.string.title_pin) {
onActionPin();
return true;
} else if (itemId == R.string.title_advanced_edit_name) {
onActionEdit();
return true;
} else if (itemId == R.string.title_delete) {
onActionDelete();
return true;
}
return false;
}
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)
return;
switch (view.getId()) {
case R.id.ibExpander:
onCollapse(folder);
break;
case R.id.tvFlagged:
case R.id.ibFlagged:
onFlagged(folder);
break;
default:
if (listener == null) {
if (!folder.selectable)
return;
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGES)
.putExtra("account", folder.account)
.putExtra("folder", folder.id)
.putExtra("type", folder.type));
} else {
if (folder.read_only)
return;
if (disabledIds.contains(folder.id))
return;
listener.onFolderSelected(folder);
}
int id = view.getId();
if (id == R.id.ibExpander) {
onCollapse(folder);
} else if (id == R.id.tvFlagged || id == R.id.ibFlagged) {
onFlagged(folder);
} else {
if (listener == null) {
if (!folder.selectable)
return;
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_VIEW_MESSAGES)
.putExtra("account", folder.account)
.putExtra("folder", folder.id)
.putExtra("type", folder.type));
} else {
if (folder.read_only)
return;
if (disabledIds.contains(folder.id))
return;
listener.onFolderSelected(folder);
}
}
}
}
@ -585,95 +582,74 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
@Override
public boolean onMenuItemClick(MenuItem item) {
if (item.getGroupId() == Menu.FIRST) {
switch (item.getItemId()) {
case R.string.title_synchronize_now:
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);
int itemId = item.getItemId();
if (itemId == R.string.title_synchronize_now) {
onActionSync(true);
return true;
case R.string.title_empty_spam:
onActionEmpty(EntityFolder.JUNK);
return true;
case R.string.title_edit_rules:
onActionEditRules();
return true;
case R.string.title_edit_properties:
onActionEditProperties();
} else if (itemId == R.string.title_synchronize_batch_enable) {
onActionEnable(true);
return true;
case R.string.title_create_channel:
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();
} else if (itemId == R.string.title_synchronize_batch_disable) {
onActionEnable(false);
return true;
}
return false;
}
default:
return false;
int itemId = item.getItemId();
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) {
@ -754,22 +730,17 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
boolean enabled = args.getBoolean("enabled");
DB db = DB.getInstance(context);
switch (property) {
case R.string.title_unified_folder:
db.folder().setFolderUnified(id, enabled);
break;
case R.string.title_navigation_folder:
db.folder().setFolderNavigation(id, enabled);
break;
case R.string.title_notify_folder:
db.folder().setFolderNotify(id, enabled);
break;
case R.string.title_synchronize_enabled:
db.folder().setFolderSynchronize(id, enabled);
ServiceSynchronize.reload(context, aid, false, "folder sync=" + enabled);
break;
default:
throw new IllegalArgumentException("Unknown folder property=" + property);
if (property == R.string.title_unified_folder) {
db.folder().setFolderUnified(id, enabled);
} else if (property == R.string.title_navigation_folder) {
db.folder().setFolderNavigation(id, enabled);
} else if (property == R.string.title_notify_folder) {
db.folder().setFolderNotify(id, enabled);
} else if (property == R.string.title_synchronize_enabled) {
db.folder().setFolderSynchronize(id, enabled);
ServiceSynchronize.reload(context, aid, false, "folder sync=" + enabled);
} else {
throw new IllegalArgumentException("Unknown folder property=" + property);
}
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() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_enabled:
onActionSync(!item.isChecked());
return true;
case R.string.title_primary:
onActionPrimary(!item.isChecked());
return true;
case R.string.title_reset_sign_key:
onActionClearSignKey();
return true;
case R.string.title_copy:
onActionCopy();
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_enabled) {
onActionSync(!item.isChecked());
return true;
} else if (itemId == R.string.title_primary) {
onActionPrimary(!item.isChecked());
return true;
} else if (itemId == R.string.title_reset_sign_key) {
onActionClearSignKey();
return true;
} else if (itemId == R.string.title_copy) {
onActionCopy();
return true;
}
return false;
}
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];
Attendee attendee = new Attendee(to.getPersonal(), to.getAddress());
switch (action) {
case R.id.btnCalendarAccept:
attendee.setParticipationStatus(ParticipationStatus.ACCEPTED);
break;
case R.id.btnCalendarDecline:
attendee.setParticipationStatus(ParticipationStatus.DECLINED);
break;
case R.id.btnCalendarMaybe:
attendee.setParticipationStatus(ParticipationStatus.TENTATIVE);
break;
if (action == R.id.btnCalendarAccept) {
attendee.setParticipationStatus(ParticipationStatus.ACCEPTED);
} else if (action == R.id.btnCalendarDecline) {
attendee.setParticipationStatus(ParticipationStatus.DECLINED);
} else if (action == R.id.btnCalendarMaybe) {
attendee.setParticipationStatus(ParticipationStatus.TENTATIVE);
}
ev.addAttendee(attendee);
@ -2805,16 +2801,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
protected void onExecuted(Bundle args, Object result) {
if (result instanceof File) {
String status = null;
switch (action) {
case R.id.btnCalendarAccept:
status = context.getString(R.string.title_icalendar_accept);
break;
case R.id.btnCalendarDecline:
status = context.getString(R.string.title_icalendar_decline);
break;
case R.id.btnCalendarMaybe:
status = context.getString(R.string.title_icalendar_maybe);
break;
if (action == R.id.btnCalendarAccept) {
status = context.getString(R.string.title_icalendar_accept);
} else if (action == R.id.btnCalendarDecline) {
status = context.getString(R.string.title_icalendar_decline);
} else if (action == R.id.btnCalendarMaybe) {
status = context.getString(R.string.title_icalendar_maybe);
}
if (args.getBoolean("share"))
@ -2925,119 +2917,78 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
else if (view.getId() == R.id.ibAddContact)
onAddContact(message);
else if (viewType == ViewType.THREAD) {
switch (view.getId()) {
case R.id.ibExpanderAddress:
onToggleAddresses(message);
break;
case R.id.ibSaveAttachments:
onSaveAttachments(message);
break;
case R.id.ibDownloadAttachments:
onDownloadAttachments(message);
break;
case R.id.ibFull:
onShow(message, true);
break;
case R.id.ibImages:
onShow(message, false);
break;
case R.id.ibDecrypt:
boolean lock =
(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:
int id = view.getId();
if (id == R.id.ibExpanderAddress) {
onToggleAddresses(message);
} else if (id == R.id.ibSaveAttachments) {
onSaveAttachments(message);
} else if (id == R.id.ibDownloadAttachments) {
onDownloadAttachments(message);
} else if (id == R.id.ibFull) {
onShow(message, true);
} else if (id == R.id.ibImages) {
onShow(message, false);
} else if (id == R.id.ibDecrypt) {
boolean lock =
(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.ibUndo:
FragmentMessages.onActionUndo(message, context, owner, parentFragment.getParentFragmentManager());
break;
case R.id.ibRule:
onMenuCreateRule(message);
break;
case R.id.ibUnsubscribe:
onActionUnsubscribe(message);
break;
case R.id.ibPrint:
onMenuPrint(message);
break;
case R.id.ibShare:
onMenuShare(message, false);
break;
case R.id.ibEvent:
if (ActivityBilling.isPro(context))
onMenuShare(message, true);
else
context.startActivity(new Intent(context, ActivityBilling.class));
break;
case R.id.ibSearch:
onSearchContact(message);
break;
case R.id.ibAnswer:
onActionAnswer(message, ibAnswer);
break;
case R.id.ibNotes:
onMenuNotes(message);
break;
case R.id.ibLabels:
onActionLabels(message);
break;
case R.id.ibKeywords:
onMenuManageKeywords(message);
break;
case R.id.ibCopy:
onActionMove(message, true);
break;
case R.id.ibMove:
onActionMove(message, false);
break;
case R.id.ibArchive:
case R.id.ibArchiveBottom:
onActionArchive(message);
break;
case R.id.ibTrash:
case R.id.ibTrashBottom:
onActionTrash(message, (Boolean) ibTrash.getTag());
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 if (id == R.id.ibVerify) {
onActionDecrypt(message, false);
} else if (id == R.id.ibUndo) {
FragmentMessages.onActionUndo(message, context, owner, parentFragment.getParentFragmentManager());
} else if (id == R.id.ibRule) {
onMenuCreateRule(message);
} else if (id == R.id.ibUnsubscribe) {
onActionUnsubscribe(message);
} else if (id == R.id.ibPrint) {
onMenuPrint(message);
} else if (id == R.id.ibShare) {
onMenuShare(message, false);
} else if (id == R.id.ibEvent) {
if (ActivityBilling.isPro(context))
onMenuShare(message, true);
else
context.startActivity(new Intent(context, ActivityBilling.class));
} else if (id == R.id.ibSearch) {
onSearchContact(message);
} else if (id == R.id.ibAnswer) {
onActionAnswer(message, ibAnswer);
} else if (id == R.id.ibNotes) {
onMenuNotes(message);
} else if (id == R.id.ibLabels) {
onActionLabels(message);
} else if (id == R.id.ibKeywords) {
onMenuManageKeywords(message);
} else if (id == R.id.ibCopy) {
onActionMove(message, true);
} else if (id == R.id.ibMove) {
onActionMove(message, false);
} else if (id == R.id.ibArchive || id == R.id.ibArchiveBottom) {
onActionArchive(message);
} else if (id == R.id.ibTrash || id == R.id.ibTrashBottom) {
onActionTrash(message, (Boolean) ibTrash.getTag());
} else if (id == R.id.ibJunk) {
onActionJunk(message);
} else if (id == R.id.ibInbox) {
onActionInbox(message);
} else if (id == R.id.ibMore) {
onActionMore(message);
} else if (id == R.id.ibTools) {
onActionTools(message);
} else if (id == R.id.ibDownloading) {
Helper.viewFAQ(context, 15);
} else if (id == R.id.ibSeen || id == R.id.ibSeenBottom) {
onMenuUnseen(message);
} else if (id == R.id.btnCalendarAccept || id == R.id.btnCalendarDecline || id == R.id.btnCalendarMaybe || id == R.id.ibCalendar) {
onActionCalendar(message, view.getId(), false);
} else {
onToggleMessage(message);
}
} else {
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)
return false;
switch (view.getId()) {
case R.id.ibFlagged:
onMenuColoredStar(message);
return true;
case R.id.ibFull:
onActionOpenFull(message);
return true;
case R.id.ibTrash:
case R.id.ibTrashBottom:
if (EntityFolder.OUTBOX.equals(message.folderType))
return false;
onActionTrash(message, true);
return true;
case R.id.btnCalendarAccept:
case R.id.btnCalendarDecline:
case R.id.btnCalendarMaybe:
onActionCalendar(message, view.getId(), true);
return true;
default:
int id = view.getId();
if (id == R.id.ibFlagged) {
onMenuColoredStar(message);
return true;
} else if (id == R.id.ibFull) {
onActionOpenFull(message);
return true;
} else if (id == R.id.ibTrash || id == R.id.ibTrashBottom) {
if (EntityFolder.OUTBOX.equals(message.folderType))
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) {
@ -3434,22 +3381,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_create_channel:
onActionCreateChannel();
return true;
case R.string.title_edit_channel:
onActionEditChannel();
return true;
case R.string.title_delete_channel:
onActionDeleteChannel();
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_create_channel) {
onActionCreateChannel();
return true;
} else if (itemId == R.string.title_edit_channel) {
onActionEditChannel();
return true;
} else if (itemId == R.string.title_delete_channel) {
onActionDeleteChannel();
return true;
}
return false;
}
@TargetApi(Build.VERSION_CODES.O)
@ -3533,18 +3476,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_insert_contact:
onInsertContact(name, email);
return true;
case R.string.title_edit_contact:
onPickContact(name, email);
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_insert_contact) {
onInsertContact(name, email);
return true;
} else if (itemId == R.string.title_edit_contact) {
onPickContact(name, email);
return true;
}
return false;
}
});
@ -4129,119 +4069,118 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem target) {
switch (target.getItemId()) {
case R.id.menu_button_junk:
onMenuButton(message, "junk", target.isChecked());
return true;
case R.id.menu_button_trash:
onMenuButton(message, "trash", target.isChecked());
return true;
case R.id.menu_button_archive:
onMenuButton(message, "archive", target.isChecked());
return true;
case R.id.menu_button_move:
onMenuButton(message, "move", target.isChecked());
return true;
case R.id.menu_button_copy:
onMenuButton(message, "copy", target.isChecked());
return true;
case R.id.menu_button_keywords:
onMenuButton(message, "keywords", target.isChecked());
return true;
case R.id.menu_button_notes:
onMenuButton(message, "notes", target.isChecked());
return true;
case R.id.menu_button_seen:
onMenuButton(message, "seen", target.isChecked());
return true;
case R.id.menu_button_search:
onMenuButton(message, "search", target.isChecked());
bindAddresses(message);
return true;
case R.id.menu_button_event:
onMenuButton(message, "event", target.isChecked());
return true;
case R.id.menu_button_share:
onMenuButton(message, "share", target.isChecked());
return true;
case R.id.menu_button_print:
onMenuButton(message, "print", target.isChecked());
return true;
case R.id.menu_button_unsubscribe:
onMenuButton(message, "unsubscribe", target.isChecked());
return true;
case R.id.menu_button_rule:
onMenuButton(message, "rule", target.isChecked());
return true;
case R.id.menu_unseen:
onMenuUnseen(message);
return true;
case R.id.menu_snooze:
onMenuSnooze(message);
return true;
case R.id.menu_hide:
onMenuHide(message);
return true;
case R.id.menu_flag_color:
onMenuColoredStar(message);
return true;
case R.id.menu_set_importance_low:
onMenuSetImportance(message, EntityMessage.PRIORITIY_LOW);
return true;
case R.id.menu_set_importance_normal:
onMenuSetImportance(message, EntityMessage.PRIORITIY_NORMAL);
return true;
case R.id.menu_set_importance_high:
onMenuSetImportance(message, EntityMessage.PRIORITIY_HIGH);
return true;
case R.id.menu_move_to:
onActionMove(message, false);
return true;
case R.id.menu_copy_to:
onActionMove(message, true);
return true;
case R.id.menu_delete:
onMenuDelete(message);
return true;
case R.id.menu_resync:
onMenuResync(message);
return true;
case R.id.menu_edit_notes:
onMenuNotes(message);
return true;
case R.id.menu_search_in_text:
onMenuSearch(message);
return true;
case R.id.menu_create_rule:
onMenuCreateRule(message);
return true;
case R.id.menu_manage_keywords:
onMenuManageKeywords(message);
return true;
case R.id.menu_share:
onMenuShare(message, false);
return true;
case R.id.menu_event:
if (ActivityBilling.isPro(context))
onMenuShare(message, true);
else
context.startActivity(new Intent(context, ActivityBilling.class));
return true;
case R.id.menu_print:
onMenuPrint(message);
return true;
case R.id.menu_show_headers:
onMenuShowHeaders(message);
return true;
case R.id.menu_raw_save:
onMenuRawSave(message);
return true;
case R.id.menu_raw_send:
onMenuRawSend(message);
return true;
default:
return false;
int itemId = target.getItemId();
if (itemId == R.id.menu_button_junk) {
onMenuButton(message, "junk", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_trash) {
onMenuButton(message, "trash", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_archive) {
onMenuButton(message, "archive", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_move) {
onMenuButton(message, "move", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_copy) {
onMenuButton(message, "copy", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_keywords) {
onMenuButton(message, "keywords", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_notes) {
onMenuButton(message, "notes", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_seen) {
onMenuButton(message, "seen", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_search) {
onMenuButton(message, "search", target.isChecked());
bindAddresses(message);
return true;
} else if (itemId == R.id.menu_button_event) {
onMenuButton(message, "event", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_share) {
onMenuButton(message, "share", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_print) {
onMenuButton(message, "print", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_unsubscribe) {
onMenuButton(message, "unsubscribe", target.isChecked());
return true;
} else if (itemId == R.id.menu_button_rule) {
onMenuButton(message, "rule", target.isChecked());
return true;
} else if (itemId == R.id.menu_unseen) {
onMenuUnseen(message);
return true;
} else if (itemId == R.id.menu_snooze) {
onMenuSnooze(message);
return true;
} else if (itemId == R.id.menu_hide) {
onMenuHide(message);
return true;
} else if (itemId == R.id.menu_flag_color) {
onMenuColoredStar(message);
return true;
} else if (itemId == R.id.menu_set_importance_low) {
onMenuSetImportance(message, EntityMessage.PRIORITIY_LOW);
return true;
} else if (itemId == R.id.menu_set_importance_normal) {
onMenuSetImportance(message, EntityMessage.PRIORITIY_NORMAL);
return true;
} else if (itemId == R.id.menu_set_importance_high) {
onMenuSetImportance(message, EntityMessage.PRIORITIY_HIGH);
return true;
} else if (itemId == R.id.menu_move_to) {
onActionMove(message, false);
return true;
} else if (itemId == R.id.menu_copy_to) {
onActionMove(message, true);
return true;
} else if (itemId == R.id.menu_delete) {
onMenuDelete(message);
return true;
} else if (itemId == R.id.menu_resync) {
onMenuResync(message);
return true;
} else if (itemId == R.id.menu_edit_notes) {
onMenuNotes(message);
return true;
} else if (itemId == R.id.menu_search_in_text) {
onMenuSearch(message);
return true;
} else if (itemId == R.id.menu_create_rule) {
onMenuCreateRule(message);
return true;
} else if (itemId == R.id.menu_manage_keywords) {
onMenuManageKeywords(message);
return true;
} else if (itemId == R.id.menu_share) {
onMenuShare(message, false);
return true;
} else if (itemId == R.id.menu_event) {
if (ActivityBilling.isPro(context))
onMenuShare(message, true);
else
context.startActivity(new Intent(context, ActivityBilling.class));
return true;
} else if (itemId == R.id.menu_print) {
onMenuPrint(message);
return true;
} else if (itemId == R.id.menu_show_headers) {
onMenuShowHeaders(message);
return true;
} else if (itemId == R.id.menu_raw_save) {
onMenuRawSave(message);
return true;
} else if (itemId == R.id.menu_raw_send) {
onMenuRawSend(message);
return true;
}
return false;
}
});
popupMenu.show();
@ -5171,30 +5110,26 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (message == null)
return false;
boolean expanded = properties.getValue("expanded", message.id);
switch (action) {
case R.id.ibExpander:
onToggleMessage(message);
return true;
case R.id.ibAvatar:
onViewContact(message);
return true;
case R.id.ibFlagged:
onToggleFlag(message);
return true;
case R.id.ibAuth:
onShowAuth(message);
return true;
case R.id.ibSnoozed:
onShowSnoozed(message);
return true;
case R.id.ibHelp:
onHelp(message);
return true;
default:
return super.performAccessibilityAction(host, action, args);
if (action == R.id.ibExpander) {
onToggleMessage(message);
return true;
} else if (action == R.id.ibAvatar) {
onViewContact(message);
return true;
} else if (action == R.id.ibFlagged) {
onToggleFlag(message);
return true;
} else if (action == R.id.ibAuth) {
onShowAuth(message);
return true;
} else if (action == R.id.ibSnoozed) {
onShowSnoozed(message);
return true;
} else if (action == R.id.ibHelp) {
onHelp(message);
return true;
}
return super.performAccessibilityAction(host, action, args);
}
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() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_delete:
onActionDelete();
return true;
default:
return false;
if (item.getItemId() == R.string.title_delete) {
onActionDelete();
return true;
}
return false;
}
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() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_rule_enabled:
onActionEnabled(!item.isChecked());
return true;
case R.string.title_rule_execute:
onActionExecute();
return true;
case R.string.title_reset:
onActionReset();
return true;
case R.string.title_move_to_folder:
onActionMove();
return true;
case R.string.title_copy:
onActionCopy();
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_rule_enabled) {
onActionEnabled(!item.isChecked());
return true;
} else if (itemId == R.string.title_rule_execute) {
onActionExecute();
return true;
} else if (itemId == R.string.title_reset) {
onActionReset();
return true;
} else if (itemId == R.string.title_move_to_folder) {
onActionMove();
return true;
} else if (itemId == R.string.title_copy) {
onActionCopy();
return true;
}
return false;
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_changelog:
onMenuChangelog();
return true;
case R.id.menu_attribution:
onMenuAttribution();
return true;
default:
return super.onOptionsItemSelected(item);
int itemId = item.getItemId();
if (itemId == R.id.menu_changelog) {
onMenuChangelog();
return true;
} else if (itemId == R.id.menu_attribution) {
onMenuAttribution();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_delete:
onMenuDelete();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_delete) {
onMenuDelete();
return true;
}
return super.onOptionsItemSelected(item);
}
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() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_imap:
onCreate(true);
return true;
case R.string.title_pop3:
onCreate(false);
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_imap) {
onCreate(true);
return true;
} else if (itemId == R.string.title_pop3) {
onCreate(false);
return true;
}
return false;
}
private void onCreate(boolean imap) {
@ -306,22 +305,21 @@ public class FragmentAccounts extends FragmentBase {
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_search:
onMenuSearch();
return true;
case R.id.menu_unified:
onMenuUnified();
return true;
case R.id.menu_theme:
onMenuTheme();
return true;
case R.id.menu_force_sync:
onMenuForceSync();
return true;
default:
return super.onOptionsItemSelected(item);
int itemId = item.getItemId();
if (itemId == R.id.menu_search) {
onMenuSearch();
return true;
} else if (itemId == R.id.menu_unified) {
onMenuUnified();
return true;
} else if (itemId == R.id.menu_theme) {
onMenuTheme();
return true;
} else if (itemId == R.id.menu_force_sync) {
onMenuForceSync();
return true;
}
return super.onOptionsItemSelected(item);
}
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() {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
switch (menuItem.getItemId()) {
case R.id.action_insert_image:
onInsertImage();
return true;
case R.id.action_delete:
onActionDelete();
return true;
case R.id.action_save:
onActionSave();
return true;
default:
return false;
int itemId = menuItem.getItemId();
if (itemId == R.id.action_insert_image) {
onInsertImage();
return true;
} else if (itemId == R.id.action_delete) {
onActionDelete();
return true;
} else if (itemId == R.id.action_save) {
onActionSave();
return true;
}
return false;
}
});
@ -223,13 +222,11 @@ public class FragmentAnswer extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public void onClick(View view) {
int request;
switch (view.getId()) {
case R.id.ivToAdd:
request = REQUEST_CONTACT_TO;
break;
case R.id.ivCcAdd:
request = REQUEST_CONTACT_CC;
break;
case R.id.ivBccAdd:
request = REQUEST_CONTACT_BCC;
break;
default:
return;
int id = view.getId();
if (id == R.id.ivToAdd) {
request = REQUEST_CONTACT_TO;
} else if (id == R.id.ivCcAdd) {
request = REQUEST_CONTACT_CC;
} else if (id == R.id.ivBccAdd) {
request = REQUEST_CONTACT_BCC;
} else {
return;
}
Intent pick = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
@ -703,25 +700,23 @@ public class FragmentCompose extends FragmentBase {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
int action = item.getItemId();
switch (action) {
case R.id.menu_record_audio:
onActionRecordAudio();
return true;
case R.id.menu_take_photo:
onActionImage(true);
return true;
case R.id.menu_image:
onActionImage(false);
return true;
case R.id.menu_attachment:
onActionAttachment();
return true;
case R.id.menu_link:
onActionLink();
return true;
default:
return onActionStyle(action, media_bar.findViewById(action));
if (action == R.id.menu_record_audio) {
onActionRecordAudio();
return true;
} else if (action == R.id.menu_take_photo) {
onActionImage(true);
return true;
} else if (action == R.id.menu_image) {
onActionImage(false);
return true;
} else if (action == R.id.menu_attachment) {
onActionAttachment();
return true;
} else if (action == R.id.menu_link) {
onActionLink();
return true;
}
return onActionStyle(action, media_bar.findViewById(action));
}
});
@ -731,19 +726,15 @@ public class FragmentCompose extends FragmentBase {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
final int action = item.getItemId();
switch (action) {
case R.id.action_delete:
onActionDiscard();
break;
case R.id.action_send:
onAction(R.id.action_check, "check");
break;
case R.id.action_save:
saved = true;
onAction(action, "save");
break;
default:
onAction(action, "navigation");
if (action == R.id.action_delete) {
onActionDiscard();
} else if (action == R.id.action_send) {
onAction(R.id.action_check, "check");
} else if (action == R.id.action_save) {
saved = true;
onAction(action, "save");
} else {
onAction(action, "navigation");
}
return true;
}
@ -1043,22 +1034,18 @@ public class FragmentCompose extends FragmentBase {
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_edit_plain_text:
convertRef(true);
return true;
case R.string.title_edit_formatted_text:
convertRef(false);
return true;
case R.string.title_delete:
deleteRef();
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_edit_plain_text) {
convertRef(true);
return true;
} else if (itemId == R.string.title_edit_formatted_text) {
convertRef(false);
return true;
} else if (itemId == R.string.title_delete) {
deleteRef();
return true;
}
return false;
}
private void convertRef(boolean plain) {
@ -1388,43 +1375,42 @@ public class FragmentCompose extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_encrypt:
onMenuEncrypt();
return true;
case R.id.menu_zoom:
onMenuZoom();
return true;
case R.id.menu_save_drafts:
onMenuSaveDrafts();
return true;
case R.id.menu_send_dialog:
onMenuSendDialog();
return true;
case R.id.menu_image_dialog:
onMenuImageDialog();
return true;
case R.id.menu_media:
onMenuMediaBar();
return true;
case R.id.menu_compact:
onMenuCompact();
return true;
case R.id.menu_contact_group:
onMenuContactGroup();
return true;
case R.id.menu_answer:
onMenuAnswer();
return true;
case R.id.menu_clear:
StyleHelper.apply(R.id.menu_clear, getViewLifecycleOwner(), null, etBody);
return true;
case R.id.menu_legend:
onMenuLegend();
return true;
default:
return super.onOptionsItemSelected(item);
int itemId = item.getItemId();
if (itemId == R.id.menu_encrypt) {
onMenuEncrypt();
return true;
} else if (itemId == R.id.menu_zoom) {
onMenuZoom();
return true;
} else if (itemId == R.id.menu_save_drafts) {
onMenuSaveDrafts();
return true;
} else if (itemId == R.id.menu_send_dialog) {
onMenuSendDialog();
return true;
} else if (itemId == R.id.menu_image_dialog) {
onMenuImageDialog();
return true;
} else if (itemId == R.id.menu_media) {
onMenuMediaBar();
return true;
} else if (itemId == R.id.menu_compact) {
onMenuCompact();
return true;
} else if (itemId == R.id.menu_contact_group) {
onMenuContactGroup();
return true;
} else if (itemId == R.id.menu_answer) {
onMenuAnswer();
return true;
} else if (itemId == R.id.menu_clear) {
StyleHelper.apply(R.id.menu_clear, getViewLifecycleOwner(), null, etBody);
return true;
} else if (itemId == R.id.menu_legend) {
onMenuLegend();
return true;
}
return super.onOptionsItemSelected(item);
}
private void onMenuAddresses() {
@ -2967,23 +2953,20 @@ public class FragmentCompose extends FragmentBase {
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.string.title_send_dialog:
FragmentDialogSend fragment = new FragmentDialogSend();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentCompose.this, REQUEST_SEND);
fragment.show(getParentFragmentManager(), "compose:send");
return true;
case R.string.title_advanced_manage_certificates:
startActivity(
new Intent(getContext(), ActivitySetup.class)
.putExtra("tab", "encryption"));
return true;
default:
return false;
int itemId = item.getItemId();
if (itemId == R.string.title_send_dialog) {
FragmentDialogSend fragment = new FragmentDialogSend();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentCompose.this, REQUEST_SEND);
fragment.show(getParentFragmentManager(), "compose:send");
return true;
} else if (itemId == R.string.title_advanced_manage_certificates) {
startActivity(
new Intent(getContext(), ActivitySetup.class)
.putExtra("tab", "encryption"));
return true;
}
return false;
}
});
@ -5055,22 +5038,20 @@ public class FragmentCompose extends FragmentBase {
}
private String getActionName(int id) {
switch (id) {
case R.id.action_delete:
return "delete";
case R.id.action_undo:
return "undo";
case R.id.action_redo:
return "redo";
case R.id.action_save:
return "save";
case R.id.action_check:
return "check";
case R.id.action_send:
return "send";
default:
return Integer.toString(id);
if (id == R.id.action_delete) {
return "delete";
} else if (id == R.id.action_undo) {
return "undo";
} else if (id == R.id.action_redo) {
return "redo";
} else if (id == R.id.action_save) {
return "save";
} else if (id == R.id.action_check) {
return "check";
} else if (id == R.id.action_send) {
return "send";
}
return Integer.toString(id);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
onMenuHelp();
return true;
case R.id.menu_delete:
new FragmentDelete().show(getParentFragmentManager(), "contacts:delete");
return true;
default:
return super.onOptionsItemSelected(item);
int itemId = item.getItemId();
if (itemId == R.id.menu_help) {
onMenuHelp();
return true;
} else if (itemId == R.id.menu_delete) {
new FragmentDelete().show(getParentFragmentManager(), "contacts:delete");
return true;
}
return super.onOptionsItemSelected(item);
}
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();
BoundaryCallbackMessages.SearchCriteria criteria = new BoundaryCallbackMessages.SearchCriteria();
switch (v.getId()) {
case R.id.ibAttachment:
criteria.with_attachments = true;
break;
case R.id.ibInvite:
criteria.with_attachments = true;
criteria.with_types = new String[]{"text/calendar"};
break;
case R.id.ibUnseen:
criteria.with_unseen = true;
break;
case R.id.ibFlagged:
criteria.with_flagged = true;
break;
int id = v.getId();
if (id == R.id.ibAttachment) {
criteria.with_attachments = true;
} else if (id == R.id.ibInvite) {
criteria.with_attachments = true;
criteria.with_types = new String[]{"text/calendar"};
} else if (id == R.id.ibUnseen) {
criteria.with_unseen = true;
} else if (id == R.id.ibFlagged) {
criteria.with_flagged = true;
}
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");
switch (rgTheme.getCheckedRadioButtonId()) {
case R.id.rbThemeBlueOrange:
if (system)
editor.putString("theme",
(reverse ? "orange_blue_system" : "blue_orange_system") +
(black ? "_black" : "")).apply();
else
editor.putString("theme",
(reverse ? "orange_blue" : "blue_orange") +
(black ? "_black" : dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeRedGreen:
if (system)
editor.putString("theme",
(reverse ? "green_red_system" : "red_green_system") +
(black ? "_black" : "")).apply();
else
editor.putString("theme",
(reverse ? "green_red" : "red_green") +
(black ? "_black" : dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeYellowPurple:
if (system)
editor.putString("theme",
(reverse ? "purple_yellow_system" : "yellow_purple_system") +
(black ? "_black" : "")).apply();
else
editor.putString("theme",
(reverse ? "purple_yellow" : "yellow_purple") +
(black ? "_black" : dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeGrey:
if (system)
editor.putString("theme", "grey_system").apply();
else
editor.putString("theme",
"grey" + (dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeBlack:
editor.putString("theme", "black").apply();
break;
case R.id.rbThemeBlackAndWhite:
editor.putString("theme", "black_and_white").apply();
break;
int checkedRadioButtonId = rgTheme.getCheckedRadioButtonId();
if (checkedRadioButtonId == R.id.rbThemeBlueOrange) {
if (system)
editor.putString("theme",
(reverse ? "orange_blue_system" : "blue_orange_system") +
(black ? "_black" : "")).apply();
else
editor.putString("theme",
(reverse ? "orange_blue" : "blue_orange") +
(black ? "_black" : dark ? "_dark" : "_light")).apply();
} else if (checkedRadioButtonId == R.id.rbThemeRedGreen) {
if (system)
editor.putString("theme",
(reverse ? "green_red_system" : "red_green_system") +
(black ? "_black" : "")).apply();
else
editor.putString("theme",
(reverse ? "green_red" : "red_green") +
(black ? "_black" : dark ? "_dark" : "_light")).apply();
} else if (checkedRadioButtonId == R.id.rbThemeYellowPurple) {
if (system)
editor.putString("theme",
(reverse ? "purple_yellow_system" : "yellow_purple_system") +
(black ? "_black" : "")).apply();
else
editor.putString("theme",
(reverse ? "purple_yellow" : "yellow_purple") +
(black ? "_black" : dark ? "_dark" : "_light")).apply();
} else if (checkedRadioButtonId == R.id.rbThemeGrey) {
if (system)
editor.putString("theme", "grey_system").apply();
else
editor.putString("theme",
"grey" + (dark ? "_dark" : "_light")).apply();
} else if (checkedRadioButtonId == R.id.rbThemeBlack) {
editor.putString("theme", "black").apply();
} else if (checkedRadioButtonId == R.id.rbThemeBlackAndWhite) {
editor.putString("theme", "black_and_white").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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_delete:
onMenuDelete();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_delete) {
onMenuDelete();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_search:
onMenuSearch();
return true;
case R.id.menu_unified:
onMenuUnified();
return true;
case R.id.menu_theme:
onMenuTheme();
return true;
case R.id.menu_compact:
onMenuCompact();
return true;
case R.id.menu_show_hidden:
onMenuShowHidden();
return true;
case R.id.menu_show_flagged:
onMenuShowFlagged();
return true;
case R.id.menu_subscribed_only:
onMenuSubscribedOnly();
return true;
case R.id.menu_apply_all:
onMenuApplyToAll();
return true;
case R.id.menu_force_sync:
onMenuForceSync();
return true;
default:
return super.onOptionsItemSelected(item);
int itemId = item.getItemId();
if (itemId == R.id.menu_search) {
onMenuSearch();
return true;
} else if (itemId == R.id.menu_unified) {
onMenuUnified();
return true;
} else if (itemId == R.id.menu_theme) {
onMenuTheme();
return true;
} else if (itemId == R.id.menu_compact) {
onMenuCompact();
return true;
} else if (itemId == R.id.menu_show_hidden) {
onMenuShowHidden();
return true;
} else if (itemId == R.id.menu_show_flagged) {
onMenuShowFlagged();
return true;
} else if (itemId == R.id.menu_subscribed_only) {
onMenuSubscribedOnly();
return true;
} else if (itemId == R.id.menu_apply_all) {
onMenuApplyToAll();
return true;
} else if (itemId == R.id.menu_force_sync) {
onMenuForceSync();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_delete:
onMenuDelete();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_delete) {
onMenuDelete();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_auto_scroll:
autoScroll = !item.isChecked();
item.setChecked(autoScroll);
return true;
case R.id.menu_clear:
onMenuClear();
return true;
default:
return super.onOptionsItemSelected(item);
int itemId = item.getItemId();
if (itemId == R.id.menu_auto_scroll) {
autoScroll = !item.isChecked();
item.setChecked(autoScroll);
return true;
} else if (itemId == R.id.menu_clear) {
onMenuClear();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
ActionData data = (ActionData) bottom_navigation.getTag();
switch (menuItem.getItemId()) {
case R.id.action_delete:
if (data.delete)
onActionDelete();
else
onActionMove(EntityFolder.TRASH);
return true;
case R.id.action_snooze:
onActionSnooze();
return true;
case R.id.action_archive:
onActionMove(EntityFolder.ARCHIVE);
return true;
case R.id.action_prev:
navigate(prev, true);
return true;
case R.id.action_next:
navigate(next, false);
return true;
default:
return false;
int itemId = menuItem.getItemId();
if (itemId == R.id.action_delete) {
if (data.delete)
onActionDelete();
else
onActionMove(EntityFolder.TRASH);
return true;
} else if (itemId == R.id.action_snooze) {
onActionSnooze();
return true;
} else if (itemId == R.id.action_archive) {
onActionMove(EntityFolder.ARCHIVE);
return true;
} else if (itemId == R.id.action_prev) {
navigate(prev, true);
return true;
} else if (itemId == R.id.action_next) {
navigate(next, false);
return true;
}
return false;
}
private void onActionMove(String folderType) {
@ -2176,41 +2170,39 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem target) {
switch (target.getItemId()) {
case R.string.title_seen:
onActionSeenSelection(true, message.id);
return true;
case R.string.title_unseen:
onActionSeenSelection(false, message.id);
return true;
case R.string.title_flag:
onActionFlagSelection(true, null, message.id);
return true;
case R.string.title_unflag:
onActionFlagSelection(false, null, message.id);
return true;
case R.string.title_snooze:
onMenuSnooze();
return true;
case R.string.title_hide:
case R.string.title_unhide:
onActionHide(message);
return true;
case R.string.title_flag_color:
onMenuColor();
return true;
case R.string.title_move:
onSwipeMove(message);
return true;
case R.string.title_report_spam:
onSwipeJunk(message);
return true;
case R.string.title_delete_permanently:
onSwipeDelete(message);
return true;
default:
return false;
int itemId = target.getItemId();
if (itemId == R.string.title_seen) {
onActionSeenSelection(true, message.id);
return true;
} else if (itemId == R.string.title_unseen) {
onActionSeenSelection(false, message.id);
return true;
} else if (itemId == R.string.title_flag) {
onActionFlagSelection(true, null, message.id);
return true;
} else if (itemId == R.string.title_unflag) {
onActionFlagSelection(false, null, message.id);
return true;
} else if (itemId == R.string.title_snooze) {
onMenuSnooze();
return true;
} else if (itemId == R.string.title_hide || itemId == R.string.title_unhide) {
onActionHide(message);
return true;
} else if (itemId == R.string.title_flag_color) {
onMenuColor();
return true;
} else if (itemId == R.string.title_move) {
onSwipeMove(message);
return true;
} else if (itemId == R.string.title_report_spam) {
onSwipeJunk(message);
return true;
} else if (itemId == R.string.title_delete_permanently) {
onSwipeDelete(message);
return true;
}
return false;
}
private void onMenuSnooze() {
@ -2467,37 +2459,36 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
return true;
}
switch (target.getItemId()) {
case R.id.menu_reply_to_sender:
onMenuReply(message, "reply", selected);
return true;
case R.id.menu_reply_to_all:
onMenuReply(message, "reply_all", selected);
return true;
case R.id.menu_reply_list:
onMenuReply(message, "list", selected);
return true;
case R.id.menu_reply_receipt:
onMenuDsn(message, EntityMessage.DSN_RECEIPT);
return true;
case R.id.menu_reply_hard_bounce:
onMenuDsn(message, EntityMessage.DSN_HARD_BOUNCE);
return true;
case R.id.menu_forward:
onMenuReply(message, "forward");
return true;
case R.id.menu_editasnew:
onMenuReply(message, "editasnew");
return true;
case R.id.menu_new_message:
onMenuNew(message, to);
return true;
case R.id.menu_reply_answer:
onMenuAnswer(message);
return true;
default:
return false;
int itemId = target.getItemId();
if (itemId == R.id.menu_reply_to_sender) {
onMenuReply(message, "reply", selected);
return true;
} else if (itemId == R.id.menu_reply_to_all) {
onMenuReply(message, "reply_all", selected);
return true;
} else if (itemId == R.id.menu_reply_list) {
onMenuReply(message, "list", selected);
return true;
} else if (itemId == R.id.menu_reply_receipt) {
onMenuDsn(message, EntityMessage.DSN_RECEIPT);
return true;
} else if (itemId == R.id.menu_reply_hard_bounce) {
onMenuDsn(message, EntityMessage.DSN_HARD_BOUNCE);
return true;
} else if (itemId == R.id.menu_forward) {
onMenuReply(message, "forward");
return true;
} else if (itemId == R.id.menu_editasnew) {
onMenuReply(message, "editasnew");
return true;
} else if (itemId == R.id.menu_new_message) {
onMenuNew(message, to);
return true;
} else if (itemId == R.id.menu_reply_answer) {
onMenuAnswer(message);
return true;
}
return false;
}
});
popupMenu.show();
@ -2864,65 +2855,64 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem target) {
switch (target.getItemId()) {
case R.string.title_seen:
onActionSeenSelection(true, null);
return true;
case R.string.title_unseen:
onActionSeenSelection(false, null);
return true;
case R.string.title_snooze:
onActionSnoozeSelection();
return true;
case R.string.title_hide:
onHideSelection(true);
return true;
case R.string.title_unhide:
onHideSelection(false);
return true;
case R.string.title_flag:
onActionFlagSelection(true, null, null);
return true;
case R.string.title_unflag:
onActionFlagSelection(false, null, null);
return true;
case R.string.title_flag_color:
onActionFlagColorSelection();
return true;
case R.string.title_importance_low:
onActionSetImportanceSelection(EntityMessage.PRIORITIY_LOW);
return true;
case R.string.title_importance_normal:
onActionSetImportanceSelection(EntityMessage.PRIORITIY_NORMAL);
return true;
case R.string.title_importance_high:
onActionSetImportanceSelection(EntityMessage.PRIORITIY_HIGH);
return true;
case R.string.title_folder_inbox:
onActionMoveSelection(EntityFolder.INBOX);
return true;
case R.string.title_archive:
onActionMoveSelection(EntityFolder.ARCHIVE);
return true;
case R.string.title_delete:
onActionDeleteSelection();
return true;
case R.string.title_trash:
onActionMoveSelection(EntityFolder.TRASH);
return true;
case R.string.title_spam:
onActionJunkSelection();
return true;
case R.string.title_move_to_account:
long account = target.getIntent().getLongExtra("account", -1);
onActionMoveSelectionAccount(account, false, result.folders);
return true;
case R.string.title_copy_to:
onActionMoveSelectionAccount(result.copyto.id, true, result.folders);
return true;
default:
return false;
int itemId = target.getItemId();
if (itemId == R.string.title_seen) {
onActionSeenSelection(true, null);
return true;
} else if (itemId == R.string.title_unseen) {
onActionSeenSelection(false, null);
return true;
} else if (itemId == R.string.title_snooze) {
onActionSnoozeSelection();
return true;
} else if (itemId == R.string.title_hide) {
onHideSelection(true);
return true;
} else if (itemId == R.string.title_unhide) {
onHideSelection(false);
return true;
} else if (itemId == R.string.title_flag) {
onActionFlagSelection(true, null, null);
return true;
} else if (itemId == R.string.title_unflag) {
onActionFlagSelection(false, null, null);
return true;
} else if (itemId == R.string.title_flag_color) {
onActionFlagColorSelection();
return true;
} else if (itemId == R.string.title_importance_low) {
onActionSetImportanceSelection(EntityMessage.PRIORITIY_LOW);
return true;
} else if (itemId == R.string.title_importance_normal) {
onActionSetImportanceSelection(EntityMessage.PRIORITIY_NORMAL);
return true;
} else if (itemId == R.string.title_importance_high) {
onActionSetImportanceSelection(EntityMessage.PRIORITIY_HIGH);
return true;
} else if (itemId == R.string.title_folder_inbox) {
onActionMoveSelection(EntityFolder.INBOX);
return true;
} else if (itemId == R.string.title_archive) {
onActionMoveSelection(EntityFolder.ARCHIVE);
return true;
} else if (itemId == R.string.title_delete) {
onActionDeleteSelection();
return true;
} else if (itemId == R.string.title_trash) {
onActionMoveSelection(EntityFolder.TRASH);
return true;
} else if (itemId == R.string.title_spam) {
onActionJunkSelection();
return true;
} else if (itemId == R.string.title_move_to_account) {
long account = target.getIntent().getLongExtra("account", -1);
onActionMoveSelectionAccount(account, false, result.folders);
return true;
} else if (itemId == R.string.title_copy_to) {
onActionMoveSelectionAccount(result.copyto.id, true, result.folders);
return true;
}
return false;
}
});
@ -4128,129 +4118,99 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_search:
onMenuSearch();
return true;
case R.id.menu_folders:
// Obsolete
onMenuFolders(primary);
return true;
case R.id.menu_empty_trash:
onMenuEmpty(EntityFolder.TRASH);
return true;
case R.id.menu_empty_spam:
onMenuEmpty(EntityFolder.JUNK);
return true;
case R.id.menu_sort_on_time:
item.setChecked(true);
onMenuSort("time");
return true;
case R.id.menu_sort_on_unread:
item.setChecked(true);
onMenuSort("unread");
return true;
case R.id.menu_sort_on_starred:
item.setChecked(true);
onMenuSort("starred");
return true;
case R.id.menu_sort_on_priority:
item.setChecked(true);
onMenuSort("priority");
return true;
case R.id.menu_sort_on_sender:
item.setChecked(true);
onMenuSort("sender");
return true;
case R.id.menu_sort_on_subject:
item.setChecked(true);
onMenuSort("subject");
return true;
case R.id.menu_sort_on_size:
item.setChecked(true);
onMenuSort("size");
return true;
case R.id.menu_sort_on_attachments:
item.setChecked(true);
onMenuSort("attachments");
return true;
case R.id.menu_sort_on_snoozed:
item.setChecked(true);
onMenuSort("snoozed");
return true;
case R.id.menu_ascending:
onMenuAscending(!item.isChecked());
return true;
case R.id.menu_filter_seen:
onMenuFilter("filter_seen", !item.isChecked());
return true;
case R.id.menu_filter_unflagged:
onMenuFilter("filter_unflagged", !item.isChecked());
return true;
case R.id.menu_filter_unknown:
onMenuFilter("filter_unknown", !item.isChecked());
return true;
case R.id.menu_filter_snoozed:
onMenuFilter("filter_snoozed", !item.isChecked());
return true;
case R.id.menu_filter_duplicates:
onMenuFilterDuplicates(!item.isChecked());
return true;
case R.id.menu_zoom:
onMenuZoom();
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);
int itemId = item.getItemId();
if (itemId == R.id.menu_search) {
onMenuSearch();
return true;
} else if (itemId == R.id.menu_folders) {// Obsolete
onMenuFolders(primary);
return true;
} else if (itemId == R.id.menu_empty_trash) {
onMenuEmpty(EntityFolder.TRASH);
return true;
} else if (itemId == R.id.menu_empty_spam) {
onMenuEmpty(EntityFolder.JUNK);
return true;
} else if (itemId == R.id.menu_sort_on_time) {
item.setChecked(true);
onMenuSort("time");
return true;
} else if (itemId == R.id.menu_sort_on_unread) {
item.setChecked(true);
onMenuSort("unread");
return true;
} else if (itemId == R.id.menu_sort_on_starred) {
item.setChecked(true);
onMenuSort("starred");
return true;
} else if (itemId == R.id.menu_sort_on_priority) {
item.setChecked(true);
onMenuSort("priority");
return true;
} else if (itemId == R.id.menu_sort_on_sender) {
item.setChecked(true);
onMenuSort("sender");
return true;
} else if (itemId == R.id.menu_sort_on_subject) {
item.setChecked(true);
onMenuSort("subject");
return true;
} else if (itemId == R.id.menu_sort_on_size) {
item.setChecked(true);
onMenuSort("size");
return true;
} else if (itemId == R.id.menu_sort_on_attachments) {
item.setChecked(true);
onMenuSort("attachments");
return true;
} else if (itemId == R.id.menu_sort_on_snoozed) {
item.setChecked(true);
onMenuSort("snoozed");
return true;
} else if (itemId == R.id.menu_ascending) {
onMenuAscending(!item.isChecked());
return true;
} else if (itemId == R.id.menu_filter_seen) {
onMenuFilter("filter_seen", !item.isChecked());
return true;
} else if (itemId == R.id.menu_filter_unflagged) {
onMenuFilter("filter_unflagged", !item.isChecked());
return true;
} else if (itemId == R.id.menu_filter_unknown) {
onMenuFilter("filter_unknown", !item.isChecked());
return true;
} else if (itemId == R.id.menu_filter_snoozed) {
onMenuFilter("filter_snoozed", !item.isChecked());
return true;
} else if (itemId == R.id.menu_filter_duplicates) {
onMenuFilterDuplicates(!item.isChecked());
return true;
} else if (itemId == R.id.menu_zoom) {
onMenuZoom();
return true;
} else if (itemId == R.id.menu_compact) {
onMenuCompact();
return true;
} else if (itemId == R.id.menu_theme) {
onMenuTheme();
return true;
} else if (itemId == R.id.menu_select_language) {
onMenuSelectLanguage();
return true;
} else if (itemId == R.id.menu_select_all || itemId == R.id.menu_select_found) {
onMenuSelectAll();
return true;
} else if (itemId == R.id.menu_mark_all_read) {
onMenuMarkAllRead();
return true;
} else if (itemId == R.id.menu_force_sync) {
onMenuForceSync();
return true;
} else if (itemId == R.id.menu_force_send) {
onSwipeRefresh();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
onMenuHelp();
return true;
case R.id.menu_delete:
new FragmentDialogDelete().show(getParentFragmentManager(), "operations:delete");
return true;
default:
return super.onOptionsItemSelected(item);
int itemId = item.getItemId();
if (itemId == R.id.menu_help) {
onMenuHelp();
return true;
} else if (itemId == R.id.menu_delete) {
new FragmentDialogDelete().show(getParentFragmentManager(), "operations:delete");
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_default:
onMenuDefault();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_default) {
onMenuDefault();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_reset_order:
onMenuResetOrder();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_reset_order) {
onMenuResetOrder();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_delete:
onMenuDelete();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_delete) {
onMenuDelete();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_response:
onMenuResponse();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_response) {
onMenuResponse();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
}
return super.onOptionsItemSelected(item);
}
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() {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
switch (menuItem.getItemId()) {
case R.id.action_delete:
onActionDelete();
return true;
case R.id.action_check:
onActionCheck();
return true;
case R.id.action_save:
onActionSave();
return true;
default:
return false;
int itemId = menuItem.getItemId();
if (itemId == R.id.action_delete) {
onActionDelete();
return true;
} else if (itemId == R.id.action_check) {
onActionCheck();
return true;
} else if (itemId == R.id.action_save) {
onActionSave();
return true;
}
return false;
}
});
@ -603,14 +602,11 @@ public class FragmentRule extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_help:
onMenuHelp();
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_help) {
onMenuHelp();
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_export:
onMenuExport();
return true;
case R.id.menu_import:
onMenuImport();
return true;
case R.id.menu_delete_all:
onMenuDelete(true);
return true;
case R.id.menu_delete_junk:
onMenuDelete(false);
return true;
default:
return super.onOptionsItemSelected(item);
int itemId = item.getItemId();
if (itemId == R.id.menu_export) {
onMenuExport();
return true;
} else if (itemId == R.id.menu_import) {
onMenuImport();
return true;
} else if (itemId == R.id.menu_delete_all) {
onMenuDelete(true);
return true;
} else if (itemId == R.id.menu_delete_junk) {
onMenuDelete(false);
return true;
}
return super.onOptionsItemSelected(item);
}
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
public boolean onMenuItemClick(MenuItem item) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
switch (item.getItemId()) {
case R.string.title_setup_gmail:
if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG)
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_GMAIL));
else
ToastEx.makeText(getContext(), R.string.title_setup_gmail_support, Toast.LENGTH_LONG).show();
return true;
case R.string.title_setup_activesync:
Helper.viewFAQ(getContext(), 133);
return true;
case R.string.title_setup_outlook:
case R.string.title_setup_other:
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP));
return true;
case R.string.title_setup_pop3:
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_POP3));
return true;
default:
if (item.getIntent() == null)
return false;
else {
if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG)
lbm.sendBroadcast(item.getIntent());
else
ToastEx.makeText(getContext(), R.string.title_setup_oauth_permission, Toast.LENGTH_LONG).show();
return true;
}
int itemId = item.getItemId();
if (itemId == R.string.title_setup_gmail) {
if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG)
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_GMAIL));
else
ToastEx.makeText(getContext(), R.string.title_setup_gmail_support, Toast.LENGTH_LONG).show();
return true;
} else if (itemId == R.string.title_setup_activesync) {
Helper.viewFAQ(getContext(), 133);
return true;
} else if (itemId == R.string.title_setup_outlook || itemId == R.string.title_setup_other) {
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP));
return true;
} else if (itemId == R.string.title_setup_pop3) {
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_POP3));
return true;
}
if (item.getIntent() == null)
return false;
else {
if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG)
lbm.sendBroadcast(item.getIntent());
else
ToastEx.makeText(getContext(), R.string.title_setup_oauth_permission, Toast.LENGTH_LONG).show();
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());
switch (action) {
case R.id.menu_bold:
case R.id.menu_italic: {
int style = (action == R.id.menu_bold ? Typeface.BOLD : Typeface.ITALIC);
boolean has = false;
for (StyleSpan span : ss.getSpans(start, end, StyleSpan.class))
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)) {
if (action == R.id.menu_bold || action == R.id.menu_italic) {
int style = (action == R.id.menu_bold ? Typeface.BOLD : Typeface.ITALIC);
boolean has = false;
for (StyleSpan span : ss.getSpans(start, end, StyleSpan.class))
if (span.getStyle() == style) {
has = true;
ss.removeSpan(span);
}
if (!has)
ss.setSpan(new UnderlineSpan(), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (!has)
ss.setSpan(new StyleSpan(style), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(ss);
etBody.setSelection(start, end);
etBody.setText(ss);
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: {
final int s = start;
final int e = end;
final SpannableStringBuilder t = new SpannableStringBuilder(ss);
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(anchor.getContext(), owner, anchor);
popupMenu.inflate(R.menu.popup_style);
String[] fontNames = anchor.getResources().getStringArray(R.array.fontNameNames);
SubMenu smenu = popupMenu.getMenu().findItem(R.id.menu_style_font).getSubMenu();
for (int i = 0; i < fontNames.length; i++)
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);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
try {
switch (item.getGroupId()) {
case R.id.group_style_size:
return setSize(item);
case R.id.group_style_color:
return setColor(item);
case R.id.group_style_align:
return setAlignment(item);
case R.id.group_style_list:
return setList(item);
case R.id.group_style_font:
return setFont(item);
case R.id.group_style_blockquote:
return setBlockQuote(item);
case R.id.group_style_strikethrough:
return setStrikeThrough(item);
case R.id.group_style_clear:
return clear(item);
default:
return false;
}
} catch (Throwable ex) {
Log.e(ex);
return false;
if (!has)
ss.setSpan(new UnderlineSpan(), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(ss);
etBody.setSelection(start, end);
return true;
} else if (action == R.id.menu_style) {
final int s = start;
final int e = end;
final SpannableStringBuilder t = new SpannableStringBuilder(ss);
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(anchor.getContext(), owner, anchor);
popupMenu.inflate(R.menu.popup_style);
String[] fontNames = anchor.getResources().getStringArray(R.array.fontNameNames);
SubMenu smenu = popupMenu.getMenu().findItem(R.id.menu_style_font).getSubMenu();
for (int i = 0; i < fontNames.length; i++)
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);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
try {
int groupId = item.getGroupId();
if (groupId == R.id.group_style_size) {
return setSize(item);
} else if (groupId == R.id.group_style_color) {
return setColor(item);
} else if (groupId == R.id.group_style_align) {
return setAlignment(item);
} else if (groupId == R.id.group_style_list) {
return setList(item);
} else if (groupId == R.id.group_style_font) {
return setFont(item);
} else if (groupId == R.id.group_style_blockquote) {
return setBlockQuote(item);
} else if (groupId == R.id.group_style_strikethrough) {
return setStrikeThrough(item);
} 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) {
RelativeSizeSpan[] spans = t.getSpans(s, e, RelativeSizeSpan.class);
for (RelativeSizeSpan span : spans)
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 boolean setSize(MenuItem item) {
RelativeSizeSpan[] spans = t.getSpans(s, e, RelativeSizeSpan.class);
for (RelativeSizeSpan span : spans)
t.removeSpan(span);
private void _setColor(Integer color) {
for (ForegroundColorSpan span : t.getSpans(s, e, ForegroundColorSpan.class))
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 (color != null)
t.setSpan(new ForegroundColorSpan(color), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (size != null)
t.setSpan(new RelativeSizeSpan(size), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(t);
etBody.setSelection(s, e);
}
etBody.setText(t);
etBody.setSelection(s, e);
private boolean setAlignment(MenuItem item) {
Pair<Integer, Integer> paragraph = ensureParagraph(t, s, e);
int start = paragraph.first;
int end = paragraph.second;
return true;
}
AlignmentSpan[] spans = t.getSpans(start, end, AlignmentSpan.class);
for (AlignmentSpan span : spans)
t.removeSpan(span);
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;
}
Layout.Alignment alignment = null;
boolean ltr = (TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_LTR);
switch (item.getItemId()) {
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;
}
private void _setColor(Integer color) {
for (ForegroundColorSpan span : t.getSpans(s, e, ForegroundColorSpan.class))
t.removeSpan(span);
if (alignment != null)
t.setSpan(new AlignmentSpan.Standard(alignment),
start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
if (color != null)
t.setSpan(new ForegroundColorSpan(color), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(t);
etBody.setSelection(start, end);
etBody.setText(t);
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) {
Context context = etBody.getContext();
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;
if (alignment != null)
t.setSpan(new AlignmentSpan.Standard(alignment),
start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
Pair<Integer, Integer> paragraph = ensureParagraph(t, s, e);
int start = paragraph.first;
int end = paragraph.second;
etBody.setText(t);
etBody.setSelection(start, end);
// Remove existing bullets
BulletSpan[] spans = t.getSpans(start, end, BulletSpan.class);
for (BulletSpan span : spans)
t.removeSpan(span);
return true;
}
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
t.setSpan(new BulletSpan(dp6, colorAccent, dp3), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
private boolean setList(MenuItem item) {
Context context = etBody.getContext();
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);
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
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;
}
j++;
i = j + 1;
}
etBody.setText(t);
etBody.setSelection(start, end);
return true;
j++;
}
private boolean setFont(MenuItem item) {
TypefaceSpan[] spans = t.getSpans(s, e, TypefaceSpan.class);
for (TypefaceSpan span : spans)
t.removeSpan(span);
etBody.setText(t);
etBody.setSelection(start, end);
int id = item.getItemId();
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 setFont(MenuItem item) {
TypefaceSpan[] spans = t.getSpans(s, e, TypefaceSpan.class);
for (TypefaceSpan span : spans)
t.removeSpan(span);
etBody.setText(t);
etBody.setSelection(s, e);
int id = item.getItemId();
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) {
Context context = etBody.getContext();
etBody.setText(t);
etBody.setSelection(s, e);
int colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary);
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;
return true;
}
QuoteSpan[] spans = t.getSpans(s, e, QuoteSpan.class);
for (QuoteSpan span : spans)
t.removeSpan(span);
private boolean setBlockQuote(MenuItem item) {
Context context = etBody.getContext();
QuoteSpan q;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
q = new QuoteSpan(colorPrimary);
else
q = new QuoteSpan(colorPrimary, dp3, dp6);
t.setSpan(q, start, end, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
int colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary);
int dp3 = Helper.dp2pixels(context, 3);
int dp6 = Helper.dp2pixels(context, 6);
etBody.setText(t);
etBody.setSelection(start, end);
Pair<Integer, Integer> paragraph = ensureParagraph(t, s, e);
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) {
boolean has = false;
for (StrikethroughSpan span : t.getSpans(s, e, StrikethroughSpan.class)) {
has = true;
t.removeSpan(span);
}
QuoteSpan q;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
q = new QuoteSpan(colorPrimary);
else
q = new QuoteSpan(colorPrimary, dp3, dp6);
t.setSpan(q, start, end, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
if (!has)
t.setSpan(new StrikethroughSpan(), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(t);
etBody.setSelection(start, end);
etBody.setText(t);
etBody.setSelection(s, e);
return true;
}
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) {
int start = s;
int end = e;
if (!has)
t.setSpan(new StrikethroughSpan(), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
// Expand to paragraph (block quotes)
if (end + 1 < t.length() && t.charAt(end) == '\n')
end++;
etBody.setText(t);
etBody.setSelection(s, e);
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());
return true;
}
t.removeSpan(span);
}
private boolean clear(MenuItem item) {
int start = s;
int end = e;
etBody.setText(t);
etBody.setSelection(s, e);
// Expand to paragraph (block quotes)
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();
return true;
}
t.removeSpan(span);
}
case R.id.menu_link: {
String url = (String) args[0];
etBody.setText(t);
etBody.setSelection(s, e);
List<Object> spans = new ArrayList<>();
for (Object span : ss.getSpans(start, end, Object.class)) {
if (!(span instanceof URLSpan))
spans.add(span);
ss.removeSpan(span);
return true;
}
});
if (url != null) {
if (start == end) {
etBody.getText().insert(start, url);
end += url.length();
ss = new SpannableString(etBody.getText());
}
popupMenu.show();
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
for (Object span : spans)
ss.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
List<Object> spans = new ArrayList<>();
for (Object span : ss.getSpans(start, end, Object.class)) {
if (!(span instanceof URLSpan))
spans.add(span);
ss.removeSpan(span);
}
etBody.setText(ss);
etBody.setSelection(end, end);
if (url != null) {
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: {
for (Object span : ss.getSpans(0, etBody.length(), Object.class))
if (!(span instanceof ImageSpan))
ss.removeSpan(span);
// Restore other spans
for (Object span : spans)
ss.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(ss);
etBody.setSelection(start, end);
etBody.setText(ss);
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 false;
return true;
}
return false;
} catch (Throwable ex) {
Log.e(ex);
return false;

Write Preview
Loading…
Cancel
Save