Do not show pEp Privacy Status for S/MIME messages OUT-468
authorThomas
Fri, 22 Jun 2018 15:08:20 +0200
branchOUT-468
changeset 22515016c73310c7
parent 2249 0891fb2e6fbe
child 2252 d2dd20e0537e
Do not show pEp Privacy Status for S/MIME messages
UI/FormRegionPrivacyStatus.cs
     1.1 --- a/UI/FormRegionPrivacyStatus.cs	Fri Jun 22 12:57:29 2018 +0200
     1.2 +++ b/UI/FormRegionPrivacyStatus.cs	Fri Jun 22 15:08:20 2018 +0200
     1.3 @@ -894,9 +894,14 @@
     1.4                              Log.Error("FormRegionPrivacyStatus_FormRegionShowing: Error occured. " + ex.ToString());
     1.5                          }
     1.6  
     1.7 -                        // If pEp is enabled, show the form region
     1.8 -                        if (omi.GetIsPEPEnabled())
     1.9 +                        if (omi.GetIsSMIMEEnabled())
    1.10                          {
    1.11 +                            // Do not show form region for S/MIME messages
    1.12 +                            enableFormRegion = false;
    1.13 +                        }
    1.14 +                        else if (omi.GetIsPEPEnabled())
    1.15 +                        {
    1.16 +                            // If pEp is enabled, show the form region
    1.17                              enableFormRegion = true;
    1.18                          }
    1.19                          else