Select account to store EML into

pull/161/head
M66B 6 years ago
parent 5d5a78c719
commit 3a7bf609d7

@ -22,6 +22,7 @@ package eu.faircode.email;
import android.Manifest; import android.Manifest;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.res.AssetFileDescriptor; import android.content.res.AssetFileDescriptor;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
@ -32,10 +33,12 @@ import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.Group; import androidx.constraintlayout.widget.Group;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
@ -43,6 +46,7 @@ import com.sun.mail.imap.IMAPFolder;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.List;
import java.util.Properties; import java.util.Properties;
import javax.mail.Flags; import javax.mail.Flags;
@ -182,7 +186,7 @@ public class ActivityEml extends ActivityBase {
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, @NonNull Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(findViewById(android.R.id.content), ex.getMessage(), Snackbar.LENGTH_LONG).show(); Snackbar.make(findViewById(android.R.id.content), ex.getMessage(), Snackbar.LENGTH_LONG).show();
else else
@ -210,18 +214,44 @@ public class ActivityEml extends ActivityBase {
} }
private void onMenuSave() { private void onMenuSave() {
new SimpleTask<List<EntityAccount>>() {
@Override
protected List<EntityAccount> onExecute(Context context, Bundle args) {
DB db = DB.getInstance(context);
return db.account().getSynchronizingAccounts();
}
@Override
protected void onExecuted(Bundle args, List<EntityAccount> accounts) {
ArrayAdapter<EntityAccount> adapter =
new ArrayAdapter<>(ActivityEml.this, R.layout.spinner_item1, android.R.id.text1);
adapter.addAll(accounts);
new AlertDialog.Builder(ActivityEml.this)
.setAdapter(adapter, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
EntityAccount account = adapter.getItem(which);
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putParcelable("uri", uri); args.putParcelable("uri", uri);
args.putLong("account", account.id);
new SimpleTask<String>() { new SimpleTask<String>() {
@Override
protected void onPreExecute(Bundle args) {
ToastEx.makeText(ActivityEml.this, R.string.title_executing, Toast.LENGTH_LONG).show();
}
@Override @Override
protected String onExecute(Context context, Bundle args) throws Throwable { protected String onExecute(Context context, Bundle args) throws Throwable {
Uri uri = args.getParcelable("uri"); Uri uri = args.getParcelable("uri");
long aid = args.getLong("account");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
EntityAccount account = db.account().getPrimaryAccount(); EntityAccount account = db.account().getAccount(aid);
if (account == null) if (account == null)
throw new IllegalArgumentException(context.getString(R.string.title_no_account)); return null;
EntityFolder inbox = db.folder().getFolderByType(account.id, EntityFolder.INBOX); EntityFolder inbox = db.folder().getFolderByType(account.id, EntityFolder.INBOX);
if (inbox == null) if (inbox == null)
throw new IllegalArgumentException(context.getString(R.string.title_no_folder)); throw new IllegalArgumentException(context.getString(R.string.title_no_folder));
@ -258,13 +288,23 @@ public class ActivityEml extends ActivityBase {
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, @NonNull Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(findViewById(android.R.id.content), ex.getMessage(), Snackbar.LENGTH_LONG).show(); Snackbar.make(findViewById(android.R.id.content), ex.getMessage(), Snackbar.LENGTH_LONG).show();
else else
Helper.unexpectedError(getSupportFragmentManager(), ex); Helper.unexpectedError(getSupportFragmentManager(), ex);
} }
}.execute(this, args, "eml:send"); }.execute(ActivityEml.this, args, "eml:store");
}
})
.show();
}
@Override
protected void onException(Bundle args, @NonNull Throwable ex) {
Helper.unexpectedError(getSupportFragmentManager(), ex);
}
}.execute(this, new Bundle(), "messages:accounts");
} }
private class Result { private class Result {

Loading…
Cancel
Save