Wrappers/WatchedWindow.cs
branchOUT-598
changeset 2857 d8bc3f810959
parent 2847 982675e56e93
parent 2854 702de5fb1d8f
child 2867 67f0cdd1b684
     1.1 --- a/Wrappers/WatchedWindow.cs	Thu Oct 31 17:19:38 2019 +0100
     1.2 +++ b/Wrappers/WatchedWindow.cs	Tue Nov 12 08:53:32 2019 +0100
     1.3 @@ -175,7 +175,7 @@
     1.4          /// <summary>
     1.5          /// Builds the latest state of the encryption status manager then shows the UI.
     1.6          /// </summary>
     1.7 -        public void BuildAndShowManager()
     1.8 +        public void BuildAndShowHandshakeDialog()
     1.9          {
    1.10              /* Resolve all recipients -- this ensures the identities list is correctly populated
    1.11               * 
    1.12 @@ -191,7 +191,7 @@
    1.13              }
    1.14              catch (Exception ex)
    1.15              {
    1.16 -                Log.Verbose("BuildAndShowManager: Error resolving recipients. " + ex.ToString());
    1.17 +                Log.Verbose("BuildAndShowHandshakeDialog: Error resolving recipients. " + ex.ToString());
    1.18              }
    1.19  
    1.20              // Build the dialog
    1.21 @@ -203,7 +203,7 @@
    1.22                  // If message is a draft, create it directly from the Outlook mail item
    1.23                  if (this.IsDraft)
    1.24                  {
    1.25 -                    Log.Verbose("BuildAndShowManager: Creating PEPMessage from draft.");
    1.26 +                    Log.Verbose("BuildAndShowHandshakeDialog: Creating PEPMessage from draft.");
    1.27  
    1.28                      if (PEPMessage.Create(this.CurrentMailItem, out this.handshakeMessage, true) == Globals.ReturnStatus.Success)
    1.29                      {
    1.30 @@ -219,7 +219,7 @@
    1.31                      }
    1.32                      else
    1.33                      {
    1.34 -                        Log.Error("BuildAndShowManager: Error creating PEPMessage from draft.");
    1.35 +                        Log.Error("BuildAndShowHandshakeDialog: Error creating PEPMessage from draft.");
    1.36                          this.handshakeMessage = null;
    1.37                      }
    1.38                  }
    1.39 @@ -229,7 +229,7 @@
    1.40                      if (PEPMessage.Create(this.CurrentMailItem, out this.handshakeMessage) != Globals.ReturnStatus.Success)
    1.41                      {
    1.42                          this.handshakeMessage = null;
    1.43 -                        Log.Error("BuildAndShowManager: Error creating handshkae message.");
    1.44 +                        Log.Error("BuildAndShowHandshakeDialog: Error creating PEPMessage from mirror.");
    1.45                      }
    1.46                  }
    1.47  
    1.48 @@ -303,7 +303,7 @@
    1.49                      }
    1.50                      else
    1.51                      {
    1.52 -                        Log.Error("BuildAndShowManager: No recipients found. No dialog opened.");
    1.53 +                        Log.Error("BuildAndShowHandshakeDialog: No recipients found. No dialog opened.");
    1.54                      }
    1.55                  }
    1.56                  else
    1.57 @@ -313,7 +313,7 @@
    1.58              }
    1.59              catch (Exception ex)
    1.60              {
    1.61 -                Globals.StopAndSendCrashReport(ex);
    1.62 +                Log.Error("BuildAndShowHandshakeDialog: Error creating handshake dialog. " + ex.ToString());
    1.63              }
    1.64          }
    1.65