|
|
@ -3474,7 +3474,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
|
|
|
|
|
|
|
|
boolean leave = (Boolean.TRUE.equals(result.leave_deleted) && result.isInbox);
|
|
|
|
boolean leave = (Boolean.TRUE.equals(result.leave_deleted) && result.isInbox);
|
|
|
|
popupMenu.getMenu().add(Menu.FIRST, R.string.title_delete_permanently, order++,
|
|
|
|
popupMenu.getMenu().add(Menu.FIRST, R.string.title_delete_permanently, order++,
|
|
|
|
leave ? R.string.title_trash : R.string.title_delete_permanently)
|
|
|
|
leave ? R.string.title_trash : R.string.title_delete_permanently)
|
|
|
|
.setIcon(leave ? R.drawable.twotone_delete_24 : R.drawable.twotone_delete_forever_24);
|
|
|
|
.setIcon(leave ? R.drawable.twotone_delete_24 : R.drawable.twotone_delete_forever_24);
|
|
|
|
|
|
|
|
|
|
|
|
for (EntityAccount account : result.accounts.keySet()) {
|
|
|
|
for (EntityAccount account : result.accounts.keySet()) {
|
|
|
@ -4616,8 +4616,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
|
|
final Snackbar snackbar = Snackbar.make(view,
|
|
|
|
final Snackbar snackbar = Snackbar.make(view,
|
|
|
|
R.string.title_setup_alarm_12,
|
|
|
|
R.string.title_setup_alarm_12,
|
|
|
|
Snackbar.LENGTH_INDEFINITE)
|
|
|
|
Snackbar.LENGTH_INDEFINITE)
|
|
|
|
.setGestureInsetBottomIgnored(true);
|
|
|
|
.setGestureInsetBottomIgnored(true);
|
|
|
|
snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
|
|
|
|
snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -5232,6 +5232,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void onMenuSearch() {
|
|
|
|
private void onMenuSearch() {
|
|
|
|
|
|
|
|
if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
Bundle args = new Bundle();
|
|
|
|
Bundle args = new Bundle();
|
|
|
|
args.putLong("account", account);
|
|
|
|
args.putLong("account", account);
|
|
|
|
args.putLong("folder", folder);
|
|
|
|
args.putLong("folder", folder);
|
|
|
|