Autocrypt: refactoring

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -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(";");
+                        Map<String, String> kv = MessageHelper.getKeyValues(message.autocrypt);
-                        for (int i = 0; i < param.length; i++) {
+                        for (String key : kv.keySet()) {
-                            int e = param[i].indexOf("=");
+                            String value = kv.get(key).toLowerCase(Locale.ROOT);
-                            if (e > 0) {
-                                String key = param[i].substring(0, e).trim().toLowerCase(Locale.ROOT);
-                                String value = param[i].substring(e + 1);
                             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");