Merge with default OUT-222
authorThomas
Fri, 13 Jul 2018 10:24:14 +0200
branchOUT-222
changeset 2292669e39629d45
parent 2284 b610482658a7
parent 2291 d20c91b79b47
child 2297 cc0598df6325
Merge with default
UI/FormControlPreviewMessage.xaml.cs
pEpForOutlook.csproj
     1.1 --- a/DecryptionStack.cs	Thu Jul 05 16:28:32 2018 +0200
     1.2 +++ b/DecryptionStack.cs	Fri Jul 13 10:24:14 2018 +0200
     1.3 @@ -263,6 +263,7 @@
     1.4                              omiCopy.SetPEPProperty(MailItemExtensions.PEPProperty.AutoConsume, "yes");
     1.5                              copiedItemsList.Add(omi.EntryID);
     1.6                              copiedItemsList.Add(omiCopy.EntryID);
     1.7 +                            omiCopy.Save();
     1.8                              Log.Verbose("DecryptionStack.DecryptionTimer_Tick: Copy OMI: " + omi.EntryID + " to: " + omiCopy.EntryID);
     1.9                          }
    1.10                          catch (Exception ex)
     2.1 --- a/PEPDatabase.cs	Thu Jul 05 16:28:32 2018 +0200
     2.2 +++ b/PEPDatabase.cs	Fri Jul 13 10:24:14 2018 +0200
     2.3 @@ -66,8 +66,7 @@
     2.4          private const string createRatingsTable = "create table if not exists " + PEPDatabase.PEP_DB_RATINGS_TABLE_NAME + " ("
     2.5                                                                                  + PEPDatabase.PEP_DB_RATINGS_ENTRY_ID_COLUMN_NAME + " varchar(50), "
     2.6                                                                                  + PEPDatabase.PEP_DB_RATINGS_RATING_COLUMN_NAME + " varchar(50), unique("
     2.7 -                                                                                + PEPDatabase.PEP_DB_RATINGS_ENTRY_ID_COLUMN_NAME + ", "
     2.8 -                                                                                + PEPDatabase.PEP_DB_RATINGS_RATING_COLUMN_NAME + "))";
     2.9 +                                                                                + PEPDatabase.PEP_DB_RATINGS_ENTRY_ID_COLUMN_NAME + "))";
    2.10  
    2.11          private static bool dbInitialized = false;
    2.12          private static object mutexDbAccess = new object();
     3.1 --- a/Properties/AssemblyInfo.cs	Thu Jul 05 16:28:32 2018 +0200
     3.2 +++ b/Properties/AssemblyInfo.cs	Fri Jul 13 10:24:14 2018 +0200
     3.3 @@ -43,5 +43,5 @@
     3.4  // You can specify all the values or you can default the Build and Revision Numbers 
     3.5  // by using the '*' as shown below:
     3.6  // [assembly: AssemblyVersion("1.0.*")]
     3.7 -[assembly: AssemblyVersion("1.0.108.0")]
     3.8 -[assembly: AssemblyFileVersion("1.0.108.0")]
     3.9 +[assembly: AssemblyVersion("1.0.109.0")]
    3.10 +[assembly: AssemblyFileVersion("1.0.109.0")]
     4.1 --- a/UI/FormControlPreviewMessage.xaml.cs	Thu Jul 05 16:28:32 2018 +0200
     4.2 +++ b/UI/FormControlPreviewMessage.xaml.cs	Fri Jul 13 10:24:14 2018 +0200
     4.3 @@ -189,9 +189,18 @@
     4.4                      }
     4.5                      else
     4.6                      {
     4.7 -                        string utf8 = Regex.Replace(m.Value, "charset=(.+)'", "charset=utf-8'", RegexOptions.Singleline | RegexOptions.IgnoreCase);
     4.8 -                        Regex r = new Regex(m.Value, RegexOptions.IgnoreCase);
     4.9 -                        htmlString = r.Replace(htmlString, utf8, 1);
    4.10 +                        string utf8 = null;
    4.11 +                        if (m.Value.Contains("charset="))
    4.12 +                        {                            
    4.13 +                            utf8 = Regex.Replace(m.Value, "charset=(.+)'", "charset='utf-8'", RegexOptions.Singleline | RegexOptions.IgnoreCase);
    4.14 +                        }
    4.15 +                        else
    4.16 +                        {
    4.17 +                            utf8 = m.Value.Replace(">", " charset='utf-8'>");
    4.18 +                        }
    4.19 +                        
    4.20 +                        Regex r = new Regex(".*", RegexOptions.IgnoreCase);
    4.21 +                        htmlString = r.Replace(htmlString, utf8, 1);                        
    4.22                      }
    4.23                  }
    4.24                  catch (Exception ex)
     5.1 --- a/pEpForOutlook.csproj	Thu Jul 05 16:28:32 2018 +0200
     5.2 +++ b/pEpForOutlook.csproj	Fri Jul 13 10:24:14 2018 +0200
     5.3 @@ -43,7 +43,7 @@
     5.4      <PublishUrl>publish\</PublishUrl>
     5.5      <InstallUrl>https://pep-project.org/</InstallUrl>
     5.6      <TargetCulture>en</TargetCulture>
     5.7 -    <ApplicationVersion>1.0.108.0</ApplicationVersion>
     5.8 +    <ApplicationVersion>1.0.109.0</ApplicationVersion>
     5.9      <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
    5.10      <UpdateEnabled>true</UpdateEnabled>
    5.11      <UpdateInterval>0</UpdateInterval>