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

Use original email address for PGP

This commit is contained in:
M66B 2021-07-22 08:57:48 +02:00
parent d2cabdd668
commit 9aa2942f8a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2276,7 +2276,7 @@ public class FragmentCompose extends FragmentBase {
List<String> emails = new ArrayList<>();
for (int i = 0; i < recipients.size(); i++) {
InternetAddress recipient = (InternetAddress) recipients.get(i);
String email = recipient.getAddress().toLowerCase(Locale.ROOT);
String email = recipient.getAddress();
if (!emails.contains(email))
emails.add(email);
}
@ -2902,7 +2902,7 @@ public class FragmentCompose extends FragmentBase {
Intent intent = new Intent(OpenPgpApi.ACTION_GET_KEY);
intent.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpSignKeyId);
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE, true);
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE_USER_ID, identity.email.toLowerCase(Locale.ROOT));
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE_USER_ID, identity.email);
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent;
@ -2922,7 +2922,7 @@ public class FragmentCompose extends FragmentBase {
Intent intent = new Intent(OpenPgpApi.ACTION_GET_KEY);
intent.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpSignKeyId);
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE, true);
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE_USER_ID, identity.email.toLowerCase(Locale.ROOT));
intent.putExtra(OpenPgpApi.EXTRA_MINIMIZE_USER_ID, identity.email);
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent;
@ -5299,7 +5299,7 @@ public class FragmentCompose extends FragmentBase {
String[] userIds = new String[recipients.size()];
for (int i = 0; i < recipients.size(); i++) {
InternetAddress recipient = (InternetAddress) recipients.get(i);
userIds[i] = recipient.getAddress().toLowerCase(Locale.ROOT);
userIds[i] = recipient.getAddress();
}
Intent intent = new Intent(OpenPgpApi.ACTION_GET_KEY_IDS);

2
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -6668,7 +6668,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
continue;
switch (key) {
case "addr":
addr = value.toLowerCase(Locale.ROOT);
addr = value;
break;
case "prefer-encrypt":
mutual = value.trim().toLowerCase(Locale.ROOT).equals("mutual");