mirror of https://github.com/M66B/FairEmail.git
Simplification
This commit is contained in:
parent
e99b883620
commit
2301ce32f2
|
@ -3595,10 +3595,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
}.execute(context, owner, args, "message:move:draft");
|
}.execute(context, owner, args, "message:move:draft");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onActionNoJunk(TupleMessageEx message) {
|
|
||||||
properties.move(message.id, EntityFolder.INBOX);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onActionArchive(TupleMessageEx message) {
|
private void onActionArchive(TupleMessageEx message) {
|
||||||
properties.move(message.id, EntityFolder.ARCHIVE);
|
properties.move(message.id, EntityFolder.ARCHIVE);
|
||||||
}
|
}
|
||||||
|
@ -3659,9 +3655,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
popupMenu.getMenu().findItem(R.id.menu_set_importance_normal).setEnabled(!EntityMessage.PRIORITIY_NORMAL.equals(i));
|
popupMenu.getMenu().findItem(R.id.menu_set_importance_normal).setEnabled(!EntityMessage.PRIORITIY_NORMAL.equals(i));
|
||||||
popupMenu.getMenu().findItem(R.id.menu_set_importance_high).setEnabled(!EntityMessage.PRIORITIY_HIGH.equals(i));
|
popupMenu.getMenu().findItem(R.id.menu_set_importance_high).setEnabled(!EntityMessage.PRIORITIY_HIGH.equals(i));
|
||||||
|
|
||||||
popupMenu.getMenu().findItem(R.id.menu_no_junk).setEnabled(message.uid != null && !message.folderReadOnly);
|
|
||||||
popupMenu.getMenu().findItem(R.id.menu_no_junk).setVisible(EntityFolder.JUNK.equals(message.folderType));
|
|
||||||
|
|
||||||
popupMenu.getMenu().findItem(R.id.menu_copy).setEnabled(message.uid != null && !message.folderReadOnly);
|
popupMenu.getMenu().findItem(R.id.menu_copy).setEnabled(message.uid != null && !message.folderReadOnly);
|
||||||
popupMenu.getMenu().findItem(R.id.menu_copy).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
|
popupMenu.getMenu().findItem(R.id.menu_copy).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
|
||||||
|
|
||||||
|
@ -3718,9 +3711,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
case R.id.menu_set_importance_high:
|
case R.id.menu_set_importance_high:
|
||||||
onMenuSetImportance(message, EntityMessage.PRIORITIY_HIGH);
|
onMenuSetImportance(message, EntityMessage.PRIORITIY_HIGH);
|
||||||
return true;
|
return true;
|
||||||
case R.id.menu_no_junk:
|
|
||||||
onActionNoJunk(message);
|
|
||||||
return true;
|
|
||||||
case R.id.menu_copy:
|
case R.id.menu_copy:
|
||||||
onActionMove(message, true);
|
onActionMove(message, true);
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -32,10 +32,6 @@
|
||||||
</menu>
|
</menu>
|
||||||
</item>
|
</item>
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/menu_no_junk"
|
|
||||||
android:title="@string/title_no_junk" />
|
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_copy"
|
android:id="@+id/menu_copy"
|
||||||
android:title="@string/title_copy_to" />
|
android:title="@string/title_copy_to" />
|
||||||
|
|
Loading…
Reference in New Issue