Assign a color depending on the encryption/signature state.

5 files changed, 46 insertions, 8 deletions

diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml
index 0f64972c..bc2fdc58 100644
--- a/components/mailviewer/contents/ui/MailDataModel.qml
+++ b/components/mailviewer/contents/ui/MailDataModel.qml
@@ -29,6 +29,20 @@ DelegateModel {
         width: parent.width
         height: childrenRect.height
 
+        function getColor(securityLevel)
+        {
+            if (securityLevel == "good") {
+                return Kube.Colors.positiveColor
+            }
+            if (securityLevel == "bad") {
+                return Kube.Colors.negativeColor
+            }
+            if (securityLevel == "notsogood") {
+                return Kube.Colors.warningColor
+            }
+            return Kube.Colors.lightgrey
+        }
+
         Row {
             anchors {
                 top: parent.top
@@ -45,7 +59,7 @@ DelegateModel {
                     bottom: parent.bottom
                 }
                 width: Kube.Units.smallSpacing
-                color: Kube.Colors.positiveColor
+                color: getColor(model.securityLevel)
                 opacity: 0.5
             }
 
diff --git a/components/mailviewer/contents/ui/MailPart.qml b/components/mailviewer/contents/ui/MailPart.qml
index 3dbca1d4..4fa2bd73 100644
--- a/components/mailviewer/contents/ui/MailPart.qml
+++ b/components/mailviewer/contents/ui/MailPart.qml
@@ -39,7 +39,7 @@ Item {
             left: parent.left
             leftMargin: Kube.Units.smallSpacing
         }
-        color: "lightgrey"
+        color: Kube.Colors.lightgrey
         height: partListView.height
         width: Kube.Units.smallSpacing
     }
diff --git a/framework/qml/Colors.qml b/framework/qml/Colors.qml
index b0be7569..ec9a09bf 100644
--- a/framework/qml/Colors.qml
+++ b/framework/qml/Colors.qml
@@ -34,6 +34,7 @@ Item {
     property string bewareOrange: "#f67400"
     property string dangerRed: "#ed1515"
     property string darkCharcoalGrey: "#232629"
+    property string lightgrey: "lightgrey"
 
     //Colorusage:
     property string textColor: charcoalGrey
diff --git a/framework/src/domain/mime/partmodel.cpp b/framework/src/domain/mime/partmodel.cpp
index de6c89c3..9f802375 100644
--- a/framework/src/domain/mime/partmodel.cpp
+++ b/framework/src/domain/mime/partmodel.cpp
@@ -86,8 +86,8 @@ QHash<int, QByteArray> PartModel::roleNames() const
     roles[IsEncryptedRole] = "encrypted";
     roles[IsSignedRole] = "signed";
     roles[SecurityLevelRole] = "securityLevel";
-    roles[EncryptionErrorType] = "errorType";
-    roles[EncryptionErrorString] = "errorString";
+    roles[ErrorType] = "errorType";
+    roles[ErrorString] = "errorString";
     roles[IsErrorRole] = "error";
     roles[SenderRole] = "sender";
     roles[DateRole] = "date";
@@ -209,9 +209,32 @@ QVariant PartModel::data(const QModelIndex &index, int role) const
                 return messagePart->encryptionState() != MimeTreeParser::KMMsgNotEncrypted;
             case IsSignedRole:
                 return messagePart->signatureState() != MimeTreeParser::KMMsgNotSigned;
-            case EncryptionErrorType:
+            case SecurityLevelRole: {
+                auto signature = messagePart->signatureState();
+                auto encryption = messagePart->encryptionState();
+                bool signatureIsOk = signature == MimeTreeParser::KMMsgPartiallySigned || 
+                                     signature == MimeTreeParser::KMMsgFullySigned;
+                bool encryptionIsOk = encryption == MimeTreeParser::KMMsgPartiallyEncrypted || 
+                                     encryption == MimeTreeParser::KMMsgFullyEncrypted;
+                bool isSigned = signature != MimeTreeParser::KMMsgNotSigned;
+                bool isEncrypted = encryption != MimeTreeParser::KMMsgNotEncrypted;
+                //Something is wonky
+                if ((isSigned && !signatureIsOk) || (isEncrypted && !encryptionIsOk)) {
+                    if (signature == MimeTreeParser::KMMsgSignatureProblematic || encryption == MimeTreeParser::KMMsgEncryptionProblematic) {
+                        return "bad";
+                    }
+                    return "notsogood";
+                }
+                //All good
+                if (signatureIsOk || encryptionIsOk) {
+                    return "good";
+                }
+                //No info
+                return "unknown";
+            }
+            case ErrorType:
                 return messagePart->error();
-            case EncryptionErrorString: {
+            case ErrorString: {
                 switch (messagePart->error()) {
                     case MimeTreeParser::MessagePart::NoKeyError:
                         return tr("No key available.");
diff --git a/framework/src/domain/mime/partmodel.h b/framework/src/domain/mime/partmodel.h
index a0e14b61..318450a5 100644
--- a/framework/src/domain/mime/partmodel.h
+++ b/framework/src/domain/mime/partmodel.h
@@ -46,8 +46,8 @@ public:
         IsSignedRole,
         IsErrorRole,
         SecurityLevelRole,
-        EncryptionErrorType,
-        EncryptionErrorString,
+        ErrorType,
+        ErrorString,
         SenderRole,
         DateRole
     };