mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix

This commit is contained in:
M66B 2019-11-04 09:57:38 +01:00
parent d7a104b8f9
commit f8009e66cf
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -2523,7 +2523,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
properties.setValue(full ? "full" : "images", message.id, !current); properties.setValue(full ? "full" : "images", message.id, !current);
onShowFullConfirmed(message); if (full)
onShowFullConfirmed(message);
else
onShowImagesConfirmed(message);
return; return;
} }
@ -2532,15 +2535,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain); CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
CheckBox cbAlwaysImages = dview.findViewById(R.id.cbAlwaysImages); CheckBox cbAlwaysImages = dview.findViewById(R.id.cbAlwaysImages);
if (full) if (full) {
cbAlwaysImages.setChecked(prefs.getBoolean("html_always_images", false)); cbAlwaysImages.setChecked(prefs.getBoolean("html_always_images", false));
cbAlwaysImages.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { cbAlwaysImages.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
prefs.edit().putBoolean("html_always_images", isChecked).apply(); prefs.edit().putBoolean("html_always_images", isChecked).apply();
} }
}); });
}
if (message.from == null || message.from.length == 0) if (message.from == null || message.from.length == 0)
cbNotAgain.setVisibility(View.GONE); cbNotAgain.setVisibility(View.GONE);
@ -2591,14 +2595,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
properties.setValue(full ? "full" : "images", message.id, true); properties.setValue(full ? "full" : "images", message.id, true);
properties.setValue(full ? "full_asked" : "images_asked", message.id, true); properties.setValue(full ? "full_asked" : "images_asked", message.id, true);
if (full) { if (full)
boolean images = prefs.getBoolean("html_always_images", false);
if (images) {
properties.setValue("images", message.id, true);
onShowImagesConfirmed(message);
}
onShowFullConfirmed(message); onShowFullConfirmed(message);
} else else
onShowImagesConfirmed(message); onShowImagesConfirmed(message);
} }
}) })
@ -2619,6 +2618,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
private void onShowFullConfirmed(final TupleMessageEx message) { private void onShowFullConfirmed(final TupleMessageEx message) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean images = prefs.getBoolean("html_always_images", false);
if (images) {
properties.setValue("images", message.id, true);
onShowImagesConfirmed(message);
}
properties.setSize(message.id, 0); properties.setSize(message.id, 0);
properties.setHeight(message.id, 0); properties.setHeight(message.id, 0);