Sending with account choosing only incase of several SMTP accounts

luwrain · Feb 4, 2018 · e77cede · e77cede
1 parent 6f05adc
commit e77cede
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 9 deletions.
diff --git a/src/main/java/org/luwrain/app/message/ActionLists.java b/src/main/java/org/luwrain/app/message/ActionLists.java
@@ -16,27 +16,62 @@
 
 package org.luwrain.app.message;
 
+import java.util.*;
+
 import org.luwrain.core.*;
 import org.luwrain.core.events.*;
+import org.luwrain.pim.*;
+import org.luwrain.pim.mail.*;
 
 final class ActionLists
 {
+ private final Luwrain luwrain;
+ private final Base base;
  private final Strings strings;
+ private final boolean severalAccounts;
 
- ActionLists(Strings strings)
+ ActionLists(Luwrain luwrain, Base base, Strings strings)
  {
+ NullCheck.notNull(luwrain, "luwrain");
+ NullCheck.notNull(base, "base");
 NullCheck.notNull(strings, "strings");
+this.luwrain = luwrain;
+this.base = base;
  this.strings = strings;
+ this.severalAccounts = severalAccountsAvailable();
  }
 
  Action[] getActions()
  {
- return new Action[]{
- new Action("send", "Отправить"),
- new Action("send-another-account", "Отправить через учётную запись"),
- new Action("choose-to", "Выбрать получателя из списка"),
- new Action("choose-cc", "Выбрать получателей копии из списка"),
- new Action("attach-file", "Прикрепить файл", new KeyboardEvent(KeyboardEvent.Special.INSERT)),//FIXME:
- };
+ final List<Action> res = new LinkedList();
+ res.add(new Action("send", "Отправить"));
+ if (severalAccounts)
+ res.add(new Action("send-another-account", "Отправить через учётную запись"));
+ res.add(new Action("choose-to", "Выбрать получателя из списка"));
+ res.add(new Action("choose-cc", "Выбрать получателей копии из списка"));
+ res.add(new Action("attach-file", "Прикрепить файл", new KeyboardEvent(KeyboardEvent.Special.INSERT)));//FIXME:
+ return res.toArray(new Action[res.size()]);
+ }
+
+ private boolean severalAccountsAvailable()
+ {
+ try {
+ final StoredMailAccount[] accounts = base.mailStoring.getAccounts().load();
+ int count = 0;
+ for(StoredMailAccount a: accounts)
+ {
+ if (a.getType() != MailAccount.Type.SMTP)
+ continue;
+ if (!a.getFlags().contains(MailAccount.Flags.ENABLED))
+ continue;
+ ++count;
+ }
+ return count >= 2;
+ }
+ catch(PimException e)
+ {
+ luwrain.crash(e);
+ return false;
+ }
  }
 }
diff --git a/src/main/java/org/luwrain/app/message/App.java b/src/main/java/org/luwrain/app/message/App.java
@@ -57,7 +57,7 @@ public App(String to, String cc,
  this.strings = (Strings)o;
  this.luwrain = luwrain;
  this.base = new Base(luwrain, strings);
- this.actionLists = new ActionLists(strings);
+ this.actionLists = new ActionLists(luwrain, base, strings);
  this.actions = new Actions(luwrain, base, strings);
  if (!base.isReady())
  return new InitResult(InitResult.Type.FAILURE);