Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 20:06:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lookuo contact info when needed only

Browse Source
This commit is contained in:
M66B
2022-07-31 07:36:20 +02:00
parent 867de1e813
commit 895751cd91
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/ContactInfo.java
View File

@@ -256,6 +256,8 @@ public class ContactInfo {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean avatars = prefs.getBoolean("avatars", true);
boolean prefer_contact = prefs.getBoolean("prefer_contact", false);
boolean distinguish_contacts = prefs.getBoolean("distinguish_contacts", false);
boolean bimi = prefs.getBoolean("bimi", false);
boolean gravatars = (prefs.getBoolean("gravatars", false) && !BuildConfig.PLAY_STORE_RELEASE);
boolean libravatars = (prefs.getBoolean("libravatars", false) && !BuildConfig.PLAY_STORE_RELEASE);
@@ -266,6 +268,7 @@ public class ContactInfo {
// Contact photo
if (!TextUtils.isEmpty(info.email) &&
(avatars || prefer_contact || distinguish_contacts) &&
Helper.hasPermission(context, Manifest.permission.READ_CONTACTS)) {
ContentResolver resolver = context.getContentResolver();
Uri uri = Uri.withAppendedPath(
@@ -308,7 +311,8 @@ public class ContactInfo {
// Favicon
if (info.bitmap == null &&
!EntityFolder.JUNK.equals(folderType) && (bimi || gravatars || libravatars || favicons)) {
(bimi || gravatars || libravatars || favicons) &&
!EntityFolder.JUNK.equals(folderType)) {
String d = UriHelper.getEmailDomain(info.email);
if (d != null) {
// Prevent using Doodles

8
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
View File

@@ -899,7 +899,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("prefer_contact", checked).apply();
WidgetUnified.updateData(getContext());
ContactInfo.clearCache(compoundButton.getContext());
WidgetUnified.updateData(compoundButton.getContext());
}
});
@@ -907,7 +908,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("only_contact", checked).apply();
WidgetUnified.updateData(getContext());
WidgetUnified.updateData(compoundButton.getContext());
}
});
@@ -915,7 +916,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("distinguish_contacts", checked).apply();
WidgetUnified.updateData(getContext());
ContactInfo.clearCache(compoundButton.getContext());
WidgetUnified.updateData(compoundButton.getContext());
}
});