mirror of
https://github.com/M66B/FairEmail.git
synced 2025-02-23 14:41:08 +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;
|
break;
|
||||||
// parameter name must be a MIME Atom
|
// parameter name must be a MIME Atom
|
||||||
if (tk.getType() != HeaderTokenizer.Token.ATOM) {
|
if (tk.getType() != HeaderTokenizer.Token.ATOM) {
|
||||||
if (!recovered) {
|
if (!recovered)
|
||||||
StringBuilder sb = new StringBuilder(s);
|
eu.faircode.email.Log.e("In parameter list <" + s + ">" +
|
||||||
int pos = h.getNextPos();
|
", at " + h.getNextPos() +
|
||||||
if (pos < sb.length())
|
|
||||||
sb.insert(pos, "^^^");
|
|
||||||
eu.faircode.email.Log.e("In parameter list <" + sb + ">" +
|
|
||||||
", expected parameter name, " +
|
", expected parameter name, " +
|
||||||
"got \"" + tk.getValue() + "\"");
|
"got \"" + tk.getValue() + "\"");
|
||||||
}
|
|
||||||
recover = true;
|
recover = true;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -259,15 +255,11 @@ public class ParameterList {
|
||||||
// expect '='
|
// expect '='
|
||||||
tk = h.next();
|
tk = h.next();
|
||||||
if ((char)tk.getType() != '=') {
|
if ((char)tk.getType() != '=') {
|
||||||
if (!recovered) {
|
if (!recovered)
|
||||||
StringBuilder sb = new StringBuilder(s);
|
eu.faircode.email.Log.e("In parameter list <" + s + ">" +
|
||||||
int pos = h.getNextPos();
|
", at " + h.getNextPos() +
|
||||||
if (pos < sb.length())
|
|
||||||
sb.insert(pos, "^^^");
|
|
||||||
eu.faircode.email.Log.e("In parameter list <" + sb + ">" +
|
|
||||||
", expected '=', " +
|
", expected '=', " +
|
||||||
"got \"" + tk.getValue() + "\"");
|
"got \"" + tk.getValue() + "\"");
|
||||||
}
|
|
||||||
recover = true;
|
recover = true;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -284,15 +276,11 @@ public class ParameterList {
|
||||||
// parameter value must be a MIME Atom or Quoted String
|
// parameter value must be a MIME Atom or Quoted String
|
||||||
if (type != HeaderTokenizer.Token.ATOM &&
|
if (type != HeaderTokenizer.Token.ATOM &&
|
||||||
type != HeaderTokenizer.Token.QUOTEDSTRING) {
|
type != HeaderTokenizer.Token.QUOTEDSTRING) {
|
||||||
if (!recovered) {
|
if (!recovered)
|
||||||
StringBuilder sb = new StringBuilder(s);
|
eu.faircode.email.Log.e("In parameter list <" + s + ">" +
|
||||||
int pos = h.getNextPos();
|
", at " + h.getNextPos() +
|
||||||
if (pos < sb.length())
|
|
||||||
sb.insert(pos, "^^^");
|
|
||||||
eu.faircode.email.Log.e("In parameter list <" + sb + ">" +
|
|
||||||
", expected parameter value, " +
|
", expected parameter value, " +
|
||||||
"got \"" + tk.getValue() + "\"");
|
"got \"" + tk.getValue() + "\"");
|
||||||
}
|
|
||||||
recover = true;
|
recover = true;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -321,12 +309,9 @@ public class ParameterList {
|
||||||
value = lastValue + " " + tk.getValue();
|
value = lastValue + " " + tk.getValue();
|
||||||
list.put(lastName, value);
|
list.put(lastName, value);
|
||||||
} else {
|
} else {
|
||||||
if (!recovered) {
|
if (!recovered)
|
||||||
StringBuilder sb = new StringBuilder(s);
|
eu.faircode.email.Log.e("In parameter list <" + s + ">" +
|
||||||
int pos = h.getNextPos();
|
", at " + h.getNextPos() +
|
||||||
if (pos < sb.length())
|
|
||||||
sb.insert(pos, "^^^");
|
|
||||||
eu.faircode.email.Log.e("In parameter list <" + sb + ">" +
|
|
||||||
", expected ';', got \"" +
|
", expected ';', got \"" +
|
||||||
tk.getValue() + "\"");
|
tk.getValue() + "\"");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue