mirror of
https://github.com/M66B/FairEmail.git
synced 2025-02-22 22:21:18 +00:00
Simplification
This commit is contained in:
parent
2c38e8910f
commit
634507c3ee
1 changed files with 12 additions and 27 deletions
|
@ -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() + "\"");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue