Merge with default OUT-308
authorThomas
Mon, 27 Nov 2017 11:35:06 +0100
branchOUT-308
changeset 193310a4738ee037
parent 1931 21f18c9714cd
parent 1930 d72f0745f282
child 1934 7162e9741ce0
child 1939 7f81b9b43f2a
Merge with default
AdapterCallbacks.cs
ThisAddIn.cs
     1.1 --- a/AdapterCallbacks.cs	Fri Nov 24 09:27:07 2017 +0100
     1.2 +++ b/AdapterCallbacks.cs	Mon Nov 27 11:35:06 2017 +0100
     1.3 @@ -104,7 +104,7 @@
     1.4                          Globals.ThisAddIn.SyncWithSettings(true);
     1.5  
     1.6                          // Ensure identities are updated with fingerprint
     1.7 -                        ownIdentity = new PEPIdentity(ThisAddIn.PEPEngine.UpdateIdentity(own));
     1.8 +                        ownIdentity = new PEPIdentity(ThisAddIn.PEPEngine.Myself(own));
     1.9                          partnerIdentity = new PEPIdentity(ThisAddIn.PEPEngine.UpdateIdentity(partner));
    1.10  
    1.11                          // Only the partner color is shown in the UI so get the rating
     2.1 --- a/ThisAddIn.cs	Fri Nov 24 09:27:07 2017 +0100
     2.2 +++ b/ThisAddIn.cs	Mon Nov 27 11:35:06 2017 +0100
     2.3 @@ -3417,7 +3417,7 @@
     2.4                              {
     2.5                                  attachments = omi.Attachments;
     2.6                                  from = cmi.From.ToCOMType();
     2.7 -                                from = ThisAddIn.PEPEngine.UpdateIdentity(from);
     2.8 +                                from = ThisAddIn.PEPEngine.Myself(from);
     2.9                                  key = ThisAddIn.PEPEngine.ExportKey(from.fpr);
    2.10  
    2.11                                  ownKey = new PEPAttachment();