Changeset 97 for trunk/UContact.pas

Timestamp:

Feb 4, 2022, 11:30:24 AM (3 years ago)

Author:

chronos

Message:

• Fixed: Quoted-printable encoded text was not handled correctly for multiple lines.

File:

• trunk/UContact.pas (modified) (6 diffs)

trunk/UContact.pas

@@ -603 +603 @@
   end else
   if Encoding = 'QUOTED-PRINTABLE' then begin
-    Result := DecodeQuotedPrintable(Value);
+    Result := DecodeQuotedPrintable(Value, True);
   end
   else Result := '';
@@ -614 +614 @@
   end else
   if Encoding = 'QUOTED-PRINTABLE' then begin
-    Result := EncodeQuotedPrintable(Value);
+    Result := EncodeQuotedPrintable(Value, True);
   end
   else Result := '';
@@ -1164 +1164 @@
               CutLength := ContactsFile.MaxLineLength;
               if Encoding = 'QUOTED-PRINTABLE' then begin
-                // Do not cut encoded items
-                if ((CutLength - 2) >= 1) and (OutText[CutLength - 2] = '=') then
+                Dec(CutLength); // There will be softline break at the end
+                // Do not cut encoded items at the end of line
+                if ((CutLength - 1) >= 1) and (OutText[CutLength - 1] = QuotedPrintableEscapeCharacter) then
                   Dec(CutLength, 2)
-                else if ((CutLength - 1) >= 1) and (OutText[CutLength - 1] = '=') then
+                else if OutText[CutLength] = QuotedPrintableEscapeCharacter then
                   Dec(CutLength, 1);
               end;
+
               CutText := UTF8Copy(OutText, 1, CutLength);
+              System.Delete(OutText, 1, Length(CutText));
+              if Encoding = 'QUOTED-PRINTABLE' then
+                CutText := CutText + QuotedPrintableEscapeCharacter; // Add soft line break
               Add(LinePrefix + CutText);
-              LinePrefix := ' ';
-              System.Delete(OutText, 1, Length(CutText));
+              if Encoding <> 'QUOTED-PRINTABLE' then
+                LinePrefix := ' ';
               Inc(LineIndex);
               Continue;
@@ -1199 +1204 @@
   CommandPart: string;
   Names: string;
+  QuotedPrintableMultiLine: Boolean;
 begin
   Result := False;
@@ -1228 +1234 @@
         CommandPart := GetNext(Line, ':');
         Names := CommandPart;
+        QuotedPrintableMultiLine := Pos('encoding=quoted-printable', LowerCase(CommandPart)) > 0;
         Value := Line;
         while True do begin
@@ -1237 +1244 @@
             Value := Value + Copy(Line2, 2, MaxInt);
           end else
-          if (Length(Line2) > 0) and (Length(Value) > 0) and (Value[Length(Value)] = '=') and
-            (Line2[1] = '=') then begin
-            Value := Value + Copy(Line2, 2, MaxInt);
+          if QuotedPrintableMultiLine and (Length(Value) > 0) and
+          (Value[Length(Value)] = QuotedPrintableEscapeCharacter) then begin
+            SetLength(Value, Length(Value) - 1);
+            Value := Value + Line2;
           end else begin
             Dec(I);