mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 07:01:05 +00:00
Code Issues Releases Wiki Activity

Added send dialog

Browse source
This commit is contained in:
M66B 2019-09-11 11:43:04 +02:00
parent 648e885baf
commit 9dcb6c2741
7 changed files with 395 additions and 368 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

541
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -135,6 +135,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.UnknownHostException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@ -199,13 +200,10 @@ public class FragmentCompose extends FragmentBase {
private boolean prefix_once = false;
private boolean monospaced = false;
private boolean style = true;
private boolean plain_only = false;
private boolean encrypt = false;
private long working = -1;
private State state = State.NONE;
private boolean show_images = false;
private boolean reminded = false;
private boolean autosave = false;
private boolean busy = false;
@ -229,15 +227,13 @@ public class FragmentCompose extends FragmentBase {
private static final int REQUEST_RECORD_AUDIO = 7;
private static final int REQUEST_ENCRYPT = 8;
private static final int REQUEST_COLOR = 9;
private static final int REQUEST_SEND_AFTER = 10;
private static final int REQUEST_REF_DELETE = 11;
private static final int REQUEST_REF_EDIT = 12;
private static final int REQUEST_CONTACT_GROUP = 13;
private static final int REQUEST_ANSWER = 14;
private static final int REQUEST_LINK = 15;
private static final int REQUEST_DISCARD = 16;
private static final int REQUEST_SEND = 17;
private static final int REQUEST_REMIND = 18;
private static final int REQUEST_REF_DELETE = 10;
private static final int REQUEST_REF_EDIT = 11;
private static final int REQUEST_CONTACT_GROUP = 12;
private static final int REQUEST_ANSWER = 13;
private static final int REQUEST_LINK = 14;
private static final int REQUEST_DISCARD = 15;
private static final int REQUEST_SEND = 16;
@Override
public void onCreate(Bundle savedInstanceState) {
@ -465,7 +461,7 @@ public class FragmentCompose extends FragmentBase {
onActionDiscard();
break;
case R.id.action_send:
onActionSend();
onActionCheck();
break;
default:
onAction(action);
@ -729,7 +725,6 @@ public class FragmentCompose extends FragmentBase {
@Override
protected void onExecuted(Bundle args, EntityMessage draft) {
plain_only = true;
getActivity().invalidateOptionsMenu();
showDraft(draft);
}
@ -760,8 +755,8 @@ public class FragmentCompose extends FragmentBase {
public void onSaveInstanceState(Bundle outState) {
outState.putLong("fair:working", working);
outState.putBoolean("fair:show_images", show_images);
outState.putBoolean("fair:reminded", reminded);
outState.putParcelable("fair:photo", photoURI);
super.onSaveInstanceState(outState);
}
@ -809,7 +804,6 @@ public class FragmentCompose extends FragmentBase {
} else {
working = savedInstanceState.getLong("fair:working");
show_images = savedInstanceState.getBoolean("fair:show_images");
reminded = savedInstanceState.getBoolean("fair:reminded");
photoURI = savedInstanceState.getParcelable("fair:photo");
Bundle args = new Bundle();
@ -900,25 +894,14 @@ public class FragmentCompose extends FragmentBase {
menu.findItem(R.id.menu_clear).setVisible(state == State.LOADED);
menu.findItem(R.id.menu_contact_group).setVisible(state == State.LOADED);
menu.findItem(R.id.menu_answer).setVisible(state == State.LOADED);
menu.findItem(R.id.menu_plain_only).setVisible(state == State.LOADED);
menu.findItem(R.id.menu_encrypt).setVisible(state == State.LOADED);
menu.findItem(R.id.menu_send_after).setVisible(state == State.LOADED);
menu.findItem(R.id.menu_zoom).setEnabled(!busy);
menu.findItem(R.id.menu_media_toolbar).setEnabled(!busy);
menu.findItem(R.id.menu_clear).setEnabled(!busy);
menu.findItem(R.id.menu_contact_group).setEnabled(!busy && hasPermission(Manifest.permission.READ_CONTACTS));
menu.findItem(R.id.menu_answer).setEnabled(!busy);
menu.findItem(R.id.menu_plain_only).setEnabled(!busy);
menu.findItem(R.id.menu_encrypt).setEnabled(!busy);
menu.findItem(R.id.menu_send_after).setEnabled(!busy);
menu.findItem(R.id.menu_media_toolbar).setChecked(style);
menu.findItem(R.id.menu_plain_only).setChecked(plain_only);
menu.findItem(R.id.menu_encrypt).setChecked(encrypt);
bottom_navigation.getMenu().findItem(R.id.action_send)
.setTitle(encrypt ? R.string.title_encrypt : R.string.title_send);
}
@Override
@ -943,15 +926,6 @@ public class FragmentCompose extends FragmentBase {
case R.id.menu_answer:
onMenuAnswer();
return true;
case R.id.menu_plain_only:
onMenuPlainOnly();
return true;
case R.id.menu_encrypt:
onMenuEncrypt();
return true;
case R.id.menu_send_after:
onMenuSendAfter();
return true;
default:
return super.onOptionsItemSelected(item);
}
@ -1029,70 +1003,6 @@ public class FragmentCompose extends FragmentBase {
fragment.show(getFragmentManager(), "compose:answer");
}
private void onMenuPlainOnly() {
plain_only = !plain_only;
getActivity().invalidateOptionsMenu();
Bundle args = new Bundle();
args.putLong("id", working);
args.putBoolean("plain_only", plain_only);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
boolean plain_only = args.getBoolean("plain_only");
DB db = DB.getInstance(context);
db.message().setMessagePlainOnly(id, plain_only);
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
}
}.execute(this, args, "compose:plain_only");
}
private void onMenuEncrypt() {
encrypt = !encrypt;
getActivity().invalidateOptionsMenu();
Bundle args = new Bundle();
args.putLong("id", working);
args.putBoolean("encrypt", encrypt);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
boolean encrypt = args.getBoolean("encrypt");
DB db = DB.getInstance(context);
db.message().setMessageEncrypt(id, encrypt);
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
}
}.execute(this, args, "compose:encrypt");
}
private void onMenuSendAfter() {
Bundle args = new Bundle();
args.putString("title", getString(R.string.title_send_at));
FragmentDialogDuration fragment = new FragmentDialogDuration();
fragment.setArguments(args);
fragment.setTargetFragment(this, REQUEST_SEND_AFTER);
fragment.show(getFragmentManager(), "send:after");
}
private void onActionRecordAudio() {
Intent intent = new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION);
startActivityForResult(intent, REQUEST_RECORD_AUDIO);
@ -1168,65 +1078,8 @@ public class FragmentCompose extends FragmentBase {
}
}
private void onActionSend() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean autosend = prefs.getBoolean("autosend", false);
if (autosend) {
onActionSendConfirmed();
return;
}
try {
EntityIdentity ident = (EntityIdentity) spIdentity.getSelectedItem();
if (ident == null)
throw new IllegalArgumentException(getString(R.string.title_from_missing));
String to = etTo.getText().toString();
String cc = etCc.getText().toString();
String bcc = etBcc.getText().toString();
InternetAddress ato[] = new InternetAddress[0];
InternetAddress acc[] = new InternetAddress[0];
InternetAddress abcc[] = new InternetAddress[0];
if (!TextUtils.isEmpty(to))
ato = InternetAddress.parse(to);
if (!TextUtils.isEmpty(cc))
acc = InternetAddress.parse(cc);
if (!TextUtils.isEmpty(bcc))
abcc = InternetAddress.parse(bcc);
if (ato.length == 0)
throw new IllegalArgumentException(getString(R.string.title_to_missing));
int plus = acc.length + abcc.length;
Bundle args = new Bundle();
args.putString("question", getString(R.string.title_ask_send_via,
MessageHelper.formatAddressesShort(ato) + (plus > 0 ? " +" + plus : ""), ident.email));
args.putString("notagain", "autosend");
FragmentDialogAsk fragment = new FragmentDialogAsk();
fragment.setArguments(args);
fragment.setTargetFragment(this, REQUEST_SEND);
fragment.show(getFragmentManager(), "compose:send");
} catch (Throwable ex) {
onActionSendConfirmed();
}
}
private void onActionSendConfirmed() {
if (encrypt)
onAction(R.id.menu_encrypt);
else
onAction(R.id.action_send);
}
private void onActionReminded() {
reminded = true;
onAction(R.id.action_send);
private void onActionCheck() {
onAction(R.id.action_check);
}
private void onEncrypt() {
@ -1304,12 +1157,6 @@ public class FragmentCompose extends FragmentBase {
if (resultCode == RESULT_OK && data != null)
onColorSelected(data.getBundleExtra("args"));
break;
case REQUEST_SEND_AFTER:
if (resultCode == RESULT_OK && data != null) {
Bundle args = data.getBundleExtra("args");
onSendAfter(args.getLong("time"));
}
break;
case REQUEST_REF_DELETE:
if (resultCode == RESULT_OK)
onReferenceDeleteConfirmed();
@ -1332,15 +1179,11 @@ public class FragmentCompose extends FragmentBase {
break;
case REQUEST_DISCARD:
if (resultCode == RESULT_OK)
onAction(R.id.action_delete);
onActionDiscardConfirmed();
break;
case REQUEST_SEND:
if (resultCode == RESULT_OK)
onActionSendConfirmed();
break;
case REQUEST_REMIND:
if (resultCode == RESULT_OK)
onActionReminded();
if (resultCode == RESULT_OK && data != null)
onActionSend(data.getBundleExtra("args"));
break;
}
} catch (Throwable ex) {
@ -1719,40 +1562,6 @@ public class FragmentCompose extends FragmentBase {
etBody.setSelection(end, end);
}
private void onSendAfter(long time) {
if (!ActivityBilling.isPro(getContext())) {
getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
return;
}
Bundle args = new Bundle();
args.putLong("id", working);
args.putLong("wakeup", time);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
Long wakeup = args.getLong("wakeup");
DB db = DB.getInstance(context);
db.message().setMessageSnoozed(id, wakeup);
return null;
}
@Override
protected void onExecuted(Bundle args, Void data) {
onAction(R.id.action_send);
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
}
}.execute(FragmentCompose.this, args, "compose:send:after");
}
private void onContactGroupSelected(Bundle args) {
if (args.getInt("target") > 0)
grpAddresses.setVisibility(View.VISIBLE);
@ -1895,6 +1704,17 @@ public class FragmentCompose extends FragmentBase {
etBody.setSelection(end, end);
}
private void onActionDiscardConfirmed() {
onAction(R.id.action_delete);
}
private void onActionSend(Bundle data) {
if (data.getBoolean("encrypt"))
onEncrypt();
else
onAction(R.id.action_send);
}
private void onExit() {
if (state != State.LOADED)
finish();
@ -1944,10 +1764,7 @@ public class FragmentCompose extends FragmentBase {
args.putString("bcc", etBcc.getText().toString().trim());
args.putString("subject", etSubject.getText().toString().trim());
args.putString("body", HtmlHelper.toHtml(etBody.getText()));
args.putBoolean("plain_only", plain_only);
args.putBoolean("encrypt", encrypt);
args.putBoolean("empty", isEmpty());
args.putBoolean("reminded", reminded);
Log.i("Run execute id=" + working);
actionLoader.execute(this, args, "compose:action:" + action);
@ -2547,8 +2364,6 @@ public class FragmentCompose extends FragmentBase {
bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(
data.draft.revision != null && !data.draft.revision.equals(data.draft.revisions));
plain_only = (data.draft.plain_only != null && data.draft.plain_only);
encrypt = (data.draft.encrypt != null && data.draft.encrypt);
getActivity().invalidateOptionsMenu();
if (args.getBoolean("incomplete"))
@ -2676,10 +2491,7 @@ public class FragmentCompose extends FragmentBase {
String bcc = args.getString("bcc");
String subject = args.getString("subject");
String body = args.getString("body");
boolean plain_only = args.getBoolean("plain_only");
boolean encrypt = args.getBoolean("encrypt");
boolean empty = args.getBoolean("empty");
boolean reminded = args.getBoolean("reminded");
EntityMessage draft;
@ -2828,7 +2640,6 @@ public class FragmentCompose extends FragmentBase {
!MessageHelper.equal(draft.cc, acc) ||
!MessageHelper.equal(draft.bcc, abcc) ||
!Objects.equals(draft.subject, subject) ||
((draft.encrypt != null && draft.encrypt) != encrypt) ||
last_available != available);
last_available = available;
@ -2842,7 +2653,6 @@ public class FragmentCompose extends FragmentBase {
draft.cc = acc;
draft.bcc = abcc;
draft.subject = subject;
draft.encrypt = encrypt;
draft.sender = MessageHelper.getSortKey(draft.from);
Uri lookupUri = ContactInfo.getLookupUri(context, draft.from);
draft.avatar = (lookupUri == null ? null : lookupUri.toString());
@ -2877,8 +2687,7 @@ public class FragmentCompose extends FragmentBase {
if (!file.exists())
Helper.writeText(file, body);
String previous = Helper.readText(file);
if (!body.equals(previous) ||
plain_only != (draft.plain_only != null && draft.plain_only)) {
if (!body.equals(previous)) {
dirty = true;
if (draft.revisions == null)
@ -2893,7 +2702,6 @@ public class FragmentCompose extends FragmentBase {
db.message().setMessageRevision(draft.id, draft.revision);
db.message().setMessageRevisions(draft.id, draft.revisions);
draft.plain_only = plain_only;
db.message().setMessageContent(draft.id,
true,
draft.plain_only,
@ -2930,57 +2738,67 @@ public class FragmentCompose extends FragmentBase {
if (action == R.id.action_save ||
action == R.id.action_undo ||
action == R.id.action_redo ||
action == R.id.menu_encrypt) {
action == R.id.action_check) {
if (BuildConfig.DEBUG || dirty)
EntityOperation.queue(context, draft, EntityOperation.ADD);
Handler handler = new Handler(context.getMainLooper());
handler.post(new Runnable() {
public void run() {
ToastEx.makeText(context, R.string.title_draft_saved, Toast.LENGTH_LONG).show();
}
});
if (action == R.id.action_check) {
// Check data
if (draft.identity == null)
throw new IllegalArgumentException(context.getString(R.string.title_from_missing));
} else if (action == R.id.action_send) {
// Check data
if (draft.identity == null)
throw new IllegalArgumentException(context.getString(R.string.title_from_missing));
if (draft.to == null && draft.cc == null && draft.bcc == null)
throw new IllegalArgumentException(context.getString(R.string.title_to_missing));
if (draft.to == null && draft.cc == null && draft.bcc == null)
throw new IllegalArgumentException(context.getString(R.string.title_to_missing));
int attached = 0;
for (EntityAttachment attachment : attachments)
if (!attachment.available)
throw new IllegalArgumentException(context.getString(R.string.title_attachments_missing));
else if (!attachment.isInline() && attachment.encryption == null)
attached++;
// Check attachments
for (EntityAttachment attachment : attachments)
if (!attachment.available)
throw new IllegalArgumentException(context.getString(R.string.title_attachments_missing));
if (identity.plain_only)
db.message().setMessagePlainOnly(draft.id, true);
boolean check_attachments = prefs.getBoolean("check_attachments", true);
if (check_attachments && !reminded && attachments.size() == 0) {
List<String> keywords = new ArrayList<>();
if (identity.encrypt)
db.message().setMessageEncrypt(draft.id, true);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
String[] k = context.getString(R.string.title_attachment_keywords).split(",");
keywords.addAll(Arrays.asList(k));
} else {
Configuration config = context.getResources().getConfiguration();
LocaleList ll = context.getResources().getConfiguration().getLocales();
for (int i = 0; i < ll.size(); i++) {
Configuration lconf = new Configuration(config);
lconf.setLocale(ll.get(i));
Context lcontext = context.createConfigurationContext(lconf);
String[] k = lcontext.getString(R.string.title_attachment_keywords).split(",");
// Check for missing attachments
if (attached == 0) {
List<String> keywords = new ArrayList<>();
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
String[] k = context.getString(R.string.title_attachment_keywords).split(",");
keywords.addAll(Arrays.asList(k));
} else {
Configuration config = context.getResources().getConfiguration();
LocaleList ll = context.getResources().getConfiguration().getLocales();
for (int i = 0; i < ll.size(); i++) {
Configuration lconf = new Configuration(config);
lconf.setLocale(ll.get(i));
Context lcontext = context.createConfigurationContext(lconf);
String[] k = lcontext.getString(R.string.title_attachment_keywords).split(",");
keywords.addAll(Arrays.asList(k));
}
}
}
String plain = HtmlHelper.getText(body);
for (String keyword : keywords)
if (plain.matches("(?si).*\\b" + Pattern.quote(keyword.trim()) + "\\b.*")) {
args.putBoolean("remind", true);
return draft;
String plain = HtmlHelper.getText(body);
for (String keyword : keywords)
if (plain.matches("(?si).*\\b" + Pattern.quote(keyword.trim()) + "\\b.*")) {
args.putBoolean("remind", true);
break;
}
}
} else {
Handler handler = new Handler(context.getMainLooper());
handler.post(new Runnable() {
public void run() {
ToastEx.makeText(context, R.string.title_draft_saved, Toast.LENGTH_LONG).show();
}
});
}
} else if (action == R.id.action_send) {
// Delete draft (cannot move to outbox)
EntityOperation.queue(context, draft, EntityOperation.DELETE);
@ -3065,18 +2883,15 @@ public class FragmentCompose extends FragmentBase {
} else if (action == R.id.action_save) {
// Do nothing
} else if (action == R.id.menu_encrypt) {
onEncrypt();
} else if (action == R.id.action_check) {
FragmentDialogSend fragment = new FragmentDialogSend();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentCompose.this, REQUEST_SEND);
fragment.show(getFragmentManager(), "compose:send");
} else if (action == R.id.action_send) {
if (args.getBoolean("remind", false)) {
FragmentDialogRemind remind = new FragmentDialogRemind();
remind.setTargetFragment(FragmentCompose.this, FragmentCompose.REQUEST_REMIND);
remind.show(getFragmentManager(), "compose:remind");
} else {
autosave = false;
finish();
}
autosave = false;
finish();
}
}
@ -3101,8 +2916,8 @@ public class FragmentCompose extends FragmentBase {
return "redo";
case R.id.action_save:
return "save";
case R.id.menu_encrypt:
return "encrypt";
case R.id.action_check:
return "check";
case R.id.action_send:
return "send";
default:
@ -3390,11 +3205,6 @@ public class FragmentCompose extends FragmentBase {
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
EntityIdentity identity = (EntityIdentity) parent.getAdapter().getItem(position);
if (identity != null && identity.encrypt) {
encrypt = true;
getActivity().invalidateOptionsMenu();
}
int at = (identity == null ? -1 : identity.email.indexOf('@'));
etExtra.setHint(at < 0 ? null : identity.email.substring(0, at));
tvDomain.setText(at < 0 ? null : identity.email.substring(at));
@ -3418,9 +3228,6 @@ public class FragmentCompose extends FragmentBase {
@Override
public void onNothingSelected(AdapterView<?> parent) {
encrypt = false;
getActivity().invalidateOptionsMenu();
etExtra.setHint("");
tvDomain.setText(null);
@ -3738,38 +3545,184 @@ public class FragmentCompose extends FragmentBase {
}
}
public static class FragmentDialogRemind extends FragmentDialogEx {
public static class FragmentDialogSend extends FragmentDialogEx {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_ask_again, null);
TextView tvMessage = dview.findViewById(R.id.tvMessage);
final CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
long id = getArguments().getLong("id");
boolean remind = getArguments().getBoolean("remind", false);
tvMessage.setText(R.string.title_attachment_reminder);
Context context = getContext();
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int send_delayed = prefs.getInt("send_delayed", 0);
return new AlertDialog.Builder(getContext())
final int[] sendDelayedValues = context.getResources().getIntArray(R.array.sendDelayedValues);
final String[] sendDelayedNames = context.getResources().getStringArray(R.array.sendDelayedNames);
View dview = LayoutInflater.from(context).inflate(R.layout.dialog_send, null);
final TextView tvTo = dview.findViewById(R.id.tvTo);
final TextView tvVia = dview.findViewById(R.id.tvVia);
final CheckBox cbPlainOnly = dview.findViewById(R.id.cbPlainOnly);
final CheckBox cbEncrypt = dview.findViewById(R.id.cbEncrypt);
final TextView tvSendAt = dview.findViewById(R.id.tvSendAt);
final ImageButton ibSendAt = dview.findViewById(R.id.ibSendAt);
final TextView tvRemindAttachment = dview.findViewById(R.id.tvRemindAttachment);
tvTo.setText(null);
tvVia.setText(null);
tvSendAt.setText(null);
tvRemindAttachment.setVisibility(remind ? View.VISIBLE : View.GONE);
DB db = DB.getInstance(context);
db.message().liveMessage(id).observe(getActivity(), new Observer<TupleMessageEx>() {
@Override
public void onChanged(TupleMessageEx draft) {
int plus = (draft.cc == null ? 0 : draft.cc.length) +
(draft.bcc == null ? 0 : draft.bcc.length);
tvTo.setText(MessageHelper.formatAddressesShort(draft.to) + (plus > 0 ? " +" + plus : ""));
tvVia.setText(draft.identityEmail);
cbPlainOnly.setChecked(draft.plain_only != null && draft.plain_only);
cbEncrypt.setChecked(draft.encrypt != null && draft.encrypt);
if (draft.ui_snoozed == null) {
if (send_delayed == 0)
tvSendAt.setText(context.getString(R.string.title_now));
else
for (int pos = 0; pos < sendDelayedValues.length; pos++)
if (sendDelayedValues[pos] == send_delayed) {
tvSendAt.setText(context.getString(R.string.title_after, sendDelayedNames[pos]));
break;
}
} else {
DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT);
DateFormat D = new SimpleDateFormat("E");
tvSendAt.setText(D.format(draft.ui_snoozed) + " " + DTF.format(draft.ui_snoozed));
}
}
});
cbPlainOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
Bundle args = new Bundle();
args.putLong("id", id);
args.putBoolean("plain_only", checked);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
boolean plain_only = args.getBoolean("plain_only");
DB db = DB.getInstance(context);
db.message().setMessagePlainOnly(id, plain_only);
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
}
}.execute(context, getActivity(), args, "compose:plain_only");
}
});
cbEncrypt.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
Bundle args = new Bundle();
args.putLong("id", id);
args.putBoolean("encrypt", checked);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
boolean encrypt = args.getBoolean("encrypt");
DB db = DB.getInstance(context);
db.message().setMessageEncrypt(id, encrypt);
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
}
}.execute(context, getActivity(), args, "compose:plain_only");
}
});
ibSendAt.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Bundle args = new Bundle();
args.putString("title", context.getString(R.string.title_send_at));
args.putLong("id", id);
FragmentDialogDuration fragment = new FragmentDialogDuration();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentDialogSend.this, 1);
fragment.show(getFragmentManager(), "send:snooze");
}
});
return new AlertDialog.Builder(context)
.setView(dview)
.setPositiveButton(R.string.title_yes, new DialogInterface.OnClickListener() {
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (cbNotAgain.isChecked())
prefs.edit().putBoolean("check_attachments", false).apply();
sendResult(Activity.RESULT_CANCELED);
}
})
.setNegativeButton(R.string.title_no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
if (cbNotAgain.isChecked())
prefs.edit().putBoolean("check_attachments", false).apply();
getArguments().putBoolean("encrypt", cbEncrypt.isChecked());
sendResult(Activity.RESULT_OK);
}
})
.create();
}
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent intent) {
super.onActivityResult(requestCode, resultCode, intent);
Context context = getContext();
if (context == null)
return;
if (!ActivityBilling.isPro(context)) {
context.startActivity(new Intent(context, ActivityBilling.class));
return;
}
Bundle data = intent.getBundleExtra("args");
long id = data.getLong("id");
long duration = data.getLong("duration");
long time = data.getLong("time");
Bundle args = new Bundle();
args.putLong("id", id);
args.putLong("wakeup", duration == 0 ? -1 : time);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
Long wakeup = args.getLong("wakeup");
DB db = DB.getInstance(context);
db.message().setMessageSnoozed(id, wakeup < 0 ? null : wakeup);
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
}
}.execute(context, getActivity(), args, "compose:snooze");
}
}
private class DraftData {

16
app/src/main/java/eu/faircode/email/FragmentDialogEx.java
View file

@ -73,13 +73,15 @@ public class FragmentDialogEx extends DialogFragment {
super.setTargetFragment(fragment, requestCode);
Log.i("Set target " + this + " " + fragment);
fragment.getViewLifecycleOwner().getLifecycle().addObserver(new LifecycleObserver() {
@OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
public void onDestroy() {
Log.i("Reset target " + FragmentDialogEx.this);
FragmentDialogEx.super.setTargetFragment(null, requestCode);
}
});
if (getView() != null) {
fragment.getViewLifecycleOwner().getLifecycle().addObserver(new LifecycleObserver() {
@OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
public void onDestroy() {
Log.i("Reset target " + FragmentDialogEx.this);
FragmentDialogEx.super.setTargetFragment(null, requestCode);
}
});
}
}
protected void sendResult(int result) {

23
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
View file

@ -49,13 +49,10 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
private Spinner spAutoResize;
private TextView tvAutoResize;
private SwitchCompat swLookupMx;
private SwitchCompat swAutoSend;
private SwitchCompat swCheckAttachments;
private Spinner spSendDelayed;
private final static String[] RESET_OPTIONS = new String[]{
"keyboard", "suggest_local", "prefix_once", "plain_only", "usenet_signature",
"autoresize", "resize", "lookup_mx", "autosend", "check_attachments", "send_delayed"
"keyboard", "suggest_local", "prefix_once", "plain_only", "usenet_signature", "autoresize", "resize", "lookup_mx", "send_delayed"
};
@Override
@ -77,8 +74,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
spAutoResize = view.findViewById(R.id.spAutoResize);
tvAutoResize = view.findViewById(R.id.tvAutoResize);
swLookupMx = view.findViewById(R.id.swLookupMx);
swAutoSend = view.findViewById(R.id.swAutoSend);
swCheckAttachments = view.findViewById(R.id.swCheckAttachments);
spSendDelayed = view.findViewById(R.id.spSendDelayed);
setOptions();
@ -151,20 +146,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
}
});
swAutoSend.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("autosend", !checked).apply();
}
});
swCheckAttachments.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("check_attachments", checked).apply();
}
});
spSendDelayed.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
@ -243,8 +224,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
spAutoResize.setEnabled(swAutoResize.isChecked());
swLookupMx.setChecked(prefs.getBoolean("lookup_mx", false));
swAutoSend.setChecked(!prefs.getBoolean("autosend", false));
swCheckAttachments.setChecked(prefs.getBoolean("check_attachments", true));
int send_delayed = prefs.getInt("send_delayed", 0);
int[] sendDelayedValues = getResources().getIntArray(R.array.sendDelayedValues);

134
app/src/main/res/layout/dialog_send.xml Normal file
View file

@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="24dp"
android:scrollbarStyle="outsideOverlay">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_send"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvToTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/title_to"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvMessage" />
<TextView
android:id="@+id/tvViaTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_via_identity"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvTo" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="end"
app:constraint_referenced_ids="tvToTitle,tvViaTitle" />
<TextView
android:id="@+id/tvTo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:text="recipients"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintTop_toTopOf="@+id/tvToTitle" />
<TextView
android:id="@+id/tvVia"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:text="via"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintTop_toTopOf="@+id/tvViaTitle" />
<CheckBox
android:id="@+id/cbPlainOnly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_send_plain_text"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvVia" />
<CheckBox
android:id="@+id/cbEncrypt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_encrypt"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbPlainOnly" />
<TextView
android:id="@+id/tvSendTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_send_at"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toStartOf="@+id/ibSendAt"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cbEncrypt" />
<TextView
android:id="@+id/tvSendAt"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:text="now"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@+id/ibSendAt"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSendTitle" />
<ImageButton
android:id="@+id/ibSendAt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/baseline_timelapse_24"
app:layout_constraintBottom_toBottomOf="@id/tvSendAt"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/tvRemindAttachment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_attachment_reminder"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?attr/colorWarning"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ibSendAt" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

26
app/src/main/res/layout/fragment_options_send.xml
View file

@ -141,30 +141,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swLookupMx" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swAutoSend"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_advanced_autosend"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvLookupMxHint"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swCheckAttachments"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_advanced_missing_attachments"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swAutoSend"
app:switchPadding="12dp" />
<TextView
android:id="@+id/tvSendDelayed"
android:layout_width="0dp"
@ -176,7 +152,7 @@
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swCheckAttachments" />
app:layout_constraintTop_toBottomOf="@id/tvLookupMxHint" />
<Spinner
android:id="@+id/spSendDelayed"

17
app/src/main/res/menu/menu_compose.xml
View file

@ -27,21 +27,4 @@
android:id="@+id/menu_answer"
android:title="@string/title_insert_template"
app:showAsAction="never" />
<item
android:id="@+id/menu_plain_only"
android:checkable="true"
android:title="@string/title_send_plain_text"
app:showAsAction="never" />
<item
android:id="@+id/menu_encrypt"
android:checkable="true"
android:title="@string/title_encrypt"
app:showAsAction="never" />
<item
android:id="@+id/menu_send_after"
android:title="@string/title_send_at"
app:showAsAction="never" />
</menu>

6
app/src/main/res/values/strings.xml
View file

@ -221,8 +221,6 @@
<string name="title_advanced_autoresize">Automatically resize attached and embedded images</string>
<string name="title_advanced_resize_pixels">&lt; %1$d pixels</string>
<string name="title_advanced_lookup_mx">Check recipient email addresses before sending</string>
<string name="title_advanced_autosend">Confirm sending messages</string>
<string name="title_advanced_missing_attachments">Check for missing attachments</string>
<string name="title_advanced_send_delayed">Delay sending messages</string>
<string name="title_advanced_metered">Use metered connections</string>
@ -576,7 +574,7 @@
<string name="title_media_toolbar">Media toolbar</string>
<string name="title_insert_contact_group">Insert contact group</string>
<string name="title_insert_template">Insert template</string>
<string name="title_send_plain_text">Send plain text only</string>
<string name="title_send_plain_text">Plain text only</string>
<string name="title_from_missing">Sender missing</string>
<string name="title_to_missing">Recipient missing</string>
@ -808,6 +806,8 @@
<string name="title_via">Via: %1$s</string>
<string name="title_1hour">1 hour</string>
<string name="title_1day">1 day</string>
<string name="title_now">Now</string>
<string name="title_after">After %1$s</string>
<string name="title_icalendar_accept">Accept</string>
<string name="title_icalendar_decline">Decline</string>