diff --git a/app/src/main/java/javax/mail/internet/ParameterList.java b/app/src/main/java/javax/mail/internet/ParameterList.java index 9336586d33..e05844e836 100644 --- a/app/src/main/java/javax/mail/internet/ParameterList.java +++ b/app/src/main/java/javax/mail/internet/ParameterList.java @@ -242,15 +242,11 @@ public class ParameterList { break; // parameter name must be a MIME Atom if (tk.getType() != HeaderTokenizer.Token.ATOM) { - if (!recovered) { - StringBuilder sb = new StringBuilder(s); - int pos = h.getNextPos(); - if (pos < sb.length()) - sb.insert(pos, "^^^"); - eu.faircode.email.Log.e("In parameter list <" + sb + ">" + + if (!recovered) + eu.faircode.email.Log.e("In parameter list <" + s + ">" + + ", at " + h.getNextPos() + ", expected parameter name, " + "got \"" + tk.getValue() + "\""); - } recover = true; continue; } @@ -259,15 +255,11 @@ public class ParameterList { // expect '=' tk = h.next(); if ((char)tk.getType() != '=') { - if (!recovered) { - StringBuilder sb = new StringBuilder(s); - int pos = h.getNextPos(); - if (pos < sb.length()) - sb.insert(pos, "^^^"); - eu.faircode.email.Log.e("In parameter list <" + sb + ">" + + if (!recovered) + eu.faircode.email.Log.e("In parameter list <" + s + ">" + + ", at " + h.getNextPos() + ", expected '=', " + "got \"" + tk.getValue() + "\""); - } recover = true; continue; } @@ -284,15 +276,11 @@ public class ParameterList { // parameter value must be a MIME Atom or Quoted String if (type != HeaderTokenizer.Token.ATOM && type != HeaderTokenizer.Token.QUOTEDSTRING) { - if (!recovered) { - StringBuilder sb = new StringBuilder(s); - int pos = h.getNextPos(); - if (pos < sb.length()) - sb.insert(pos, "^^^"); - eu.faircode.email.Log.e("In parameter list <" + sb + ">" + + if (!recovered) + eu.faircode.email.Log.e("In parameter list <" + s + ">" + + ", at " + h.getNextPos() + ", expected parameter value, " + "got \"" + tk.getValue() + "\""); - } recover = true; continue; } @@ -321,12 +309,9 @@ public class ParameterList { value = lastValue + " " + tk.getValue(); list.put(lastName, value); } else { - if (!recovered) { - StringBuilder sb = new StringBuilder(s); - int pos = h.getNextPos(); - if (pos < sb.length()) - sb.insert(pos, "^^^"); - eu.faircode.email.Log.e("In parameter list <" + sb + ">" + + if (!recovered) + eu.faircode.email.Log.e("In parameter list <" + s + ">" + + ", at " + h.getNextPos() + ", expected ';', got \"" + tk.getValue() + "\""); }