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

Autocrypt: refactoring

This commit is contained in:
M66B 2021-07-18 14:12:35 +02:00
parent 273d7e0dd2
commit d98ad1b5ac
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6650,12 +6650,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
byte[] keydata = null;
// https://autocrypt.org/level1.html#the-autocrypt-header
String[] param = message.autocrypt.split(";");
for (int i = 0; i < param.length; i++) {
int e = param[i].indexOf("=");
if (e > 0) {
String key = param[i].substring(0, e).trim().toLowerCase(Locale.ROOT);
String value = param[i].substring(e + 1);
Map<String, String> kv = MessageHelper.getKeyValues(message.autocrypt);
for (String key : kv.keySet()) {
String value = kv.get(key).toLowerCase(Locale.ROOT);
Log.i("Autocrypt " + key + "=" + value);
switch (key) {
case "addr":
@ -6669,7 +6666,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
break;
}
}
}
if (addr == null)
throw new IllegalArgumentException("Autocrypt: addr not found");