Issue zom#603: Display "No Zom Codes for...", if there are no trusted…

… keys AND no untrusted NEW keys for a buddy.
tladesignz · May 14, 2018 · 966fa17 · 966fa17
1 parent 3dfd19d
commit 966fa17
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/Zom/Zom/Classes/View Controllers/ZomFingerprintBaseViewController.swift b/Zom/Zom/Classes/View Controllers/ZomFingerprintBaseViewController.swift
@@ -199,23 +199,32 @@ class ZomFingerprintBaseViewController: UIViewController {
     }
 
     /**
-     - returns: the total number of `.untrustedNew` OMEMO and OTR keys aka. fingerprints.
+     Counts the number of trusted (`.trustedTofu` and `.trustedUser`) OMEMO keys resp. OTR
+     fingerprints and the number of `.untrustedNew` OMEMO keys resp. OTR fingerprints.
+
+     - returns: An Array of size 2, first is number of .untrustedNew, second is number of trusted.
     */
-    func countUntrusted() -> Int {
+    func countKeys() -> [Int] {
         var untrusted = 0
+        var trusted = 0
 
         for device in omemoDevices {
             if device.trustLevel == .untrustedNew {
                 untrusted += 1
+            } else if device.trustLevel == .trustedTofu || device.trustLevel == .trustedUser {
+                trusted += 1
             }
         }
 
         for fingerprint in otrFingerprints {
             if fingerprint.trustLevel == .untrustedNew {
                 untrusted += 1
+            } else if fingerprint.trustLevel == .trustedTofu
+                || fingerprint.trustLevel == .trustedUser {
+                trusted += 1
             }
         }
 
-        return untrusted
+        return [trusted, untrusted]
     }
 }
diff --git a/Zom/Zom/Classes/View Controllers/ZomVerificationDetailViewController.swift b/Zom/Zom/Classes/View Controllers/ZomVerificationDetailViewController.swift
@@ -89,11 +89,18 @@ class ZomVerificationDetailViewController: ZomFingerprintBaseViewController, UIT
      information in the `subtitleLb` label.
     */
     private func updateUntrustedNewFingerprintsInfo() {
-        let untrusted = countUntrusted()
+        let trust = countKeys()
+        let trusted = trust[0]
+        let untrusted = trust[1]
 
         ZomFingerprintBaseViewController.setBadge(badgeLb, ok: untrusted < 1)
 
-        subtitleLb.text = NSLocalizedString("\(untrusted) Untrusted New Codes for \(buddyName())",
-            comment: "Subtitle for code verification detail scene")
+        if trusted > 0 || untrusted > 0 {
+            subtitleLb.text = NSLocalizedString("\(untrusted) Untrusted New Codes for \(buddyName())",
+                comment: "Subtitle for code verification detail scene")
+        } else {
+            subtitleLb.text = NSLocalizedString("No Zom Codes for \(buddyName())",
+                comment: "Subtitle for code verification detail scene")
+        }
     }
 }
diff --git a/Zom/Zom/Classes/View Controllers/ZomVerificationDetailViewController.xib b/Zom/Zom/Classes/View Controllers/ZomVerificationDetailViewController.xib
@@ -58,7 +58,7 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&lt;x&gt; Untrusted Codes for &lt;buddy&gt;" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hrq-Te-DwM">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&lt;x&gt; Untrusted New Codes for &lt;buddy&gt;" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hrq-Te-DwM">
                     <rect key="frame" x="32" y="113" width="311" height="21"/>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
                     <nil key="textColor"/>

diff --git a/Zom/Zom/Classes/View Controllers/ZomVerificationViewController.swift b/Zom/Zom/Classes/View Controllers/ZomVerificationViewController.swift
@@ -53,7 +53,7 @@ class ZomVerificationViewController: ZomFingerprintBaseViewController {
      OTR fingerprint if no OMEMO device found.
     */
     override func fingerprintsLoaded() {
-        ZomFingerprintBaseViewController.setBadge(badgeLb, ok: countUntrusted() < 1)
+        ZomFingerprintBaseViewController.setBadge(badgeLb, ok: countKeys()[1] < 1)
 
         if let device = omemoDevices
             .filter({ (device) -> Bool in return device.trustLevel == .untrustedNew })