mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 06:31:17 +00:00
Code Issues Releases Wiki Activity

Display name only by default

Browse source
This commit is contained in:
M66B 2019-08-25 11:14:16 +02:00
parent dd5ab6c487
commit b1704da1f7
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -3010,7 +3010,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
this.date = prefs.getBoolean("date", true); this.date = prefs.getBoolean("date", true);
this.threading = prefs.getBoolean("threading", true); this.threading = prefs.getBoolean("threading", true);
this.name_email = prefs.getBoolean("name_email", !compact); this.name_email = prefs.getBoolean("name_email", false);
this.subject_top = prefs.getBoolean("subject_top", false); this.subject_top = prefs.getBoolean("subject_top", false);
this.subject_italic = prefs.getBoolean("subject_italic", true); this.subject_italic = prefs.getBoolean("subject_italic", true);
this.flags = prefs.getBoolean("flags", true); this.flags = prefs.getBoolean("flags", true);
@ -3064,9 +3064,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
void setCompact(boolean compact) { void setCompact(boolean compact) {
if (this.compact != compact) { if (this.compact != compact) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
this.compact = compact; this.compact = compact;
this.name_email = prefs.getBoolean("name_email", !compact);
notifyDataSetChanged(); notifyDataSetChanged();
} }
} }

4
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
View file

@ -359,8 +359,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
private void setOptions() { private void setOptions() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean compact = prefs.getBoolean("compact", false);
String startup = prefs.getString("startup", "unified"); String startup = prefs.getString("startup", "unified");
String[] startupValues = getResources().getStringArray(R.array.startupValues); String[] startupValues = getResources().getStringArray(R.array.startupValues);
for (int pos = 0; pos < startupValues.length; pos++) for (int pos = 0; pos < startupValues.length; pos++)
@ -378,7 +376,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
swIdenticons.setChecked(prefs.getBoolean("identicons", false)); swIdenticons.setChecked(prefs.getBoolean("identicons", false));
swIdenticons.setEnabled(swGeneratedIcons.isChecked()); swIdenticons.setEnabled(swGeneratedIcons.isChecked());
swCircular.setChecked(prefs.getBoolean("circular", true)); swCircular.setChecked(prefs.getBoolean("circular", true));
swNameEmail.setChecked(prefs.getBoolean("name_email", !compact)); swNameEmail.setChecked(prefs.getBoolean("name_email", false));
swSubjectTop.setChecked(prefs.getBoolean("subject_top", false)); swSubjectTop.setChecked(prefs.getBoolean("subject_top", false));
swSubjectItalic.setChecked(prefs.getBoolean("subject_italic", true)); swSubjectItalic.setChecked(prefs.getBoolean("subject_italic", true));
swFlags.setChecked(prefs.getBoolean("flags", true)); swFlags.setChecked(prefs.getBoolean("flags", true));