mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-04 10:39:25 +00:00
Code Issues Releases Wiki Activity

Allow enabling send dialog again

Browse source
This commit is contained in:
M66B 2019-09-12 23:25:31 +02:00
parent 20b47840cc
commit c0cc0526ac
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1092,8 +1092,6 @@ public class FragmentCompose extends FragmentBase {
private void onActionCheck(boolean dialog) { private void onActionCheck(boolean dialog) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
if (dialog)
prefs.edit().remove("send_dialog").apply();
boolean send_dialog = prefs.getBoolean("send_dialog", true); boolean send_dialog = prefs.getBoolean("send_dialog", true);
Bundle extras = new Bundle(); Bundle extras = new Bundle();
@ -3594,8 +3592,11 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
long id = getArguments().getLong("id"); long id = getArguments().getLong("id");
boolean remind_subject = getArguments().getBoolean("remind_subject", false);
boolean remind_attachment = getArguments().getBoolean("remind_attachment", false); Bundle args = getArguments();
boolean dialog = args.getBundle("extras").getBoolean("dialog");
boolean remind_subject = args.getBoolean("remind_subject", false);
boolean remind_attachment = args.getBoolean("remind_attachment", false);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
int send_delayed = prefs.getInt("send_delayed", 0); int send_delayed = prefs.getInt("send_delayed", 0);
@ -3620,7 +3621,8 @@ public class FragmentCompose extends FragmentBase {
tvSendAt.setText(null); tvSendAt.setText(null);
tvRemindSubject.setVisibility(remind_subject ? View.VISIBLE : View.GONE); tvRemindSubject.setVisibility(remind_subject ? View.VISIBLE : View.GONE);
tvRemindAttachment.setVisibility(remind_attachment ? View.VISIBLE : View.GONE); tvRemindAttachment.setVisibility(remind_attachment ? View.VISIBLE : View.GONE);
cbNotAgain.setVisibility(send_dialog ? View.VISIBLE : View.GONE); cbNotAgain.setChecked(!send_dialog);
cbNotAgain.setVisibility(dialog ? View.VISIBLE : View.GONE);
DB db = DB.getInstance(getContext()); DB db = DB.getInstance(getContext());
db.message().liveMessage(id).observe(getViewLifecycleOwner(), new Observer<TupleMessageEx>() { db.message().liveMessage(id).observe(getViewLifecycleOwner(), new Observer<TupleMessageEx>() {
@ -3725,8 +3727,7 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
getArguments().putBoolean("encrypt", cbEncrypt.isChecked()); getArguments().putBoolean("encrypt", cbEncrypt.isChecked());
if (cbNotAgain.isChecked()) prefs.edit().putBoolean("send_dialog", !cbNotAgain.isChecked()).apply();
prefs.edit().putBoolean("send_dialog", false).apply();
sendResult(Activity.RESULT_OK); sendResult(Activity.RESULT_OK);
} }
}) })