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

EML: use account selector

Browse Source
pull/207/head
M66B 4 years ago
parent 44ed7a8558
commit 24ca4f30d1
1 changed files with 65 additions and 85 deletions
Show Stats Download Patch File Download Diff File

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

@ -105,6 +105,7 @@ public class ActivityEML extends ActivityBase {
private Uri uri; private Uri uri;
private MessageHelper.AttachmentPart apart; private MessageHelper.AttachmentPart apart;
private static final int REQUEST_ATTACHMENT = 1; private static final int REQUEST_ATTACHMENT = 1;
private static final int REQUEST_ACCOUNT = 2;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -500,6 +501,10 @@ public class ActivityEML extends ActivityBase {
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
onSaveAttachment(data); onSaveAttachment(data);
break; break;
case REQUEST_ACCOUNT:
if (resultCode == RESULT_OK && data != null)
onSave(data.getBundleExtra("args"));
break;
} }
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
@ -591,107 +596,82 @@ public class ActivityEML extends ActivityBase {
} }
private void onMenuSave() { private void onMenuSave() {
new SimpleTask<List<EntityAccount>>() { Bundle args = new Bundle();
args.putInt("type", EntityAccount.TYPE_IMAP);
FragmentDialogSelectAccount fragment = new FragmentDialogSelectAccount();
fragment.setArguments(args);
fragment.setTargetActivity(this, REQUEST_ACCOUNT);
fragment.show(getSupportFragmentManager(), "eml:account");
}
private void onSave(Bundle args) {
args.putParcelable("uri", uri);
args.putBoolean("junk", junk);
new SimpleTask<String>() {
@Override @Override
protected List<EntityAccount> onExecute(Context context, Bundle args) { protected void onPreExecute(Bundle args) {
DB db = DB.getInstance(context); ToastEx.makeText(ActivityEML.this, R.string.title_executing, Toast.LENGTH_LONG).show();
return db.account().getSynchronizingAccounts(EntityAccount.TYPE_IMAP);
} }
@Override @Override
protected void onExecuted(Bundle args, List<EntityAccount> accounts) { protected String onExecute(Context context, Bundle args) throws Throwable {
ArrayAdapter<EntityAccount> adapter = Uri uri = args.getParcelable("uri");
new ArrayAdapter<>(ActivityEML.this, R.layout.spinner_item1, android.R.id.text1); long aid = args.getLong("account");
for (EntityAccount account : accounts)
adapter.add(account);
new AlertDialog.Builder(ActivityEML.this)
.setIcon(R.drawable.twotone_save_alt_24)
.setTitle(R.string.title_save_eml)
.setAdapter(adapter, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
EntityAccount account = adapter.getItem(which);
Bundle args = new Bundle(); DB db = DB.getInstance(context);
args.putParcelable("uri", uri); EntityAccount account = db.account().getAccount(aid);
args.putLong("account", account.id); if (account == null)
args.putBoolean("junk", junk); return null;
EntityFolder folder = db.folder().getFolderByType(account.id,
junk ? EntityFolder.JUNK : EntityFolder.INBOX);
if (folder == null)
throw new IllegalArgumentException(context.getString(R.string.title_no_folder));
new SimpleTask<String>() { ContentResolver resolver = context.getContentResolver();
@Override try (InputStream is = resolver.openInputStream(uri)) {
protected void onPreExecute(Bundle args) {
ToastEx.makeText(ActivityEML.this, R.string.title_executing, Toast.LENGTH_LONG).show();
}
@Override Properties props = MessageHelper.getSessionProperties();
protected String onExecute(Context context, Bundle args) throws Throwable { Session isession = Session.getInstance(props, null);
Uri uri = args.getParcelable("uri"); MimeMessage imessage = new MimeMessage(isession, is);
long aid = args.getLong("account");
DB db = DB.getInstance(context);
EntityAccount account = db.account().getAccount(aid);
if (account == null)
return null;
EntityFolder folder = db.folder().getFolderByType(account.id,
junk ? EntityFolder.JUNK : EntityFolder.INBOX);
if (folder == null)
throw new IllegalArgumentException(context.getString(R.string.title_no_folder));
ContentResolver resolver = context.getContentResolver();
try (InputStream is = resolver.openInputStream(uri)) {
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
MimeMessage imessage = new MimeMessage(isession, is);
try (EmailService iservice = new EmailService(
context, account.getProtocol(), account.realm, account.encryption, account.insecure, true)) {
iservice.setPartialFetch(account.partial_fetch);
iservice.setIgnoreBodyStructureSize(account.ignore_size);
iservice.connect(account);
IMAPFolder ifolder = (IMAPFolder) iservice.getStore().getFolder(folder.name);
ifolder.open(Folder.READ_WRITE);
if (ifolder.getPermanentFlags().contains(Flags.Flag.DRAFT))
imessage.setFlag(Flags.Flag.DRAFT, false);
ifolder.appendMessages(new Message[]{imessage});
}
}
EntityOperation.sync(context, folder.id, true); try (EmailService iservice = new EmailService(
ServiceSynchronize.eval(context, "EML"); context, account.getProtocol(), account.realm, account.encryption, account.insecure, true)) {
iservice.setPartialFetch(account.partial_fetch);
iservice.setIgnoreBodyStructureSize(account.ignore_size);
iservice.connect(account);
return account.name + "/" + folder.name; IMAPFolder ifolder = (IMAPFolder) iservice.getStore().getFolder(folder.name);
} ifolder.open(Folder.READ_WRITE);
@Override if (ifolder.getPermanentFlags().contains(Flags.Flag.DRAFT))
protected void onExecuted(Bundle args, String name) { imessage.setFlag(Flags.Flag.DRAFT, false);
ToastEx.makeText(ActivityEML.this, name, Toast.LENGTH_LONG).show();
}
@Override ifolder.appendMessages(new Message[]{imessage});
protected void onException(Bundle args, @NonNull Throwable ex) { }
if (ex instanceof IllegalArgumentException) }
Snackbar.make(findViewById(android.R.id.content), ex.getMessage(), Snackbar.LENGTH_LONG)
.setGestureInsetBottomIgnored(true).show(); EntityOperation.sync(context, folder.id, true);
else ServiceSynchronize.eval(context, "EML");
Log.unexpectedError(getSupportFragmentManager(), ex);
} return account.name + "/" + folder.name;
}.execute(ActivityEML.this, args, "eml:store"); }
}
}) @Override
.setNegativeButton(android.R.string.cancel, null) protected void onExecuted(Bundle args, String name) {
.show(); ToastEx.makeText(ActivityEML.this, name, Toast.LENGTH_LONG).show();
} }
@Override @Override
protected void onException(Bundle args, @NonNull Throwable ex) { protected void onException(Bundle args, @NonNull Throwable ex) {
Log.unexpectedError(getSupportFragmentManager(), ex); if (ex instanceof IllegalArgumentException)
Snackbar.make(findViewById(android.R.id.content), ex.getMessage(), Snackbar.LENGTH_LONG)
.setGestureInsetBottomIgnored(true).show();
else
Log.unexpectedError(getSupportFragmentManager(), ex);
} }
}.execute(this, new Bundle(), "messages:accounts"); }.execute(ActivityEML.this, args, "eml:store");
} }
private class Result { private class Result {

Write Preview
Loading…
Cancel
Save