Merge pull request #581 from tladesignz/master

First step for Xcode 9.3 compatibility: Update HTMLReader to 2.1.1

Zom/Cartfile

@@ -1,5 +1,5 @@
 github "ChatSecure/Mantle" "2.1.0_headerfix"
-github "nolanw/HTMLReader" "1d0dda3"
+github "nolanw/HTMLReader" ~> 2.1.1
 github "AFNetworking/AFNetworking" ~> 3.1
 github "TheLevelUp/ZXingObjC" ~> 3.2.2
 github "soffes/SAMKeychain" ~> 1.5

Zom/Cartfile.resolved

@@ -1,11 +1,11 @@
-github "AFNetworking/AFNetworking" "3.1.0"
+github "AFNetworking/AFNetworking" "3.2.0"
 github "ChatSecure/Mantle" "4c1a09cb0c0811956cd35262340e42b940971cbb"
 github "PureLayout/PureLayout" "v3.0.2"
 github "TTTAttributedLabel/TTTAttributedLabel" "2.0.0"
 github "TheLevelUp/ZXingObjC" "3.2.2"
 github "facebook/KVOController" "v1.2.0"
 github "jdg/MBProgressHUD" "1.1.0"
 github "mattt/FormatterKit" "1.8.2"
-github "nolanw/HTMLReader" "1d0dda3849ff719fa15a0c4cac0118c70ef2217c"
+github "nolanw/HTMLReader" "v2.1.1"
 github "soffes/SAMKeychain" "v1.5.3"
 github "xmartlabs/XLForm" "4.0.0"

Zom/Zom.xcodeproj/project.pbxproj

@@ -1664,7 +1664,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0910;
+				LastUpgradeCheck = 0930;
 				TargetAttributes = {
 					A065EDA2202C50640084D788 = {
 						CreatedOnToolsVersion = 9.2;
@@ -3066,11 +3066,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -3103,11 +3105,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;

Zom/Zom/Classes/View Controllers/ZomFingerprintBaseViewController.swift

@@ -71,6 +71,9 @@ class ZomFingerprintBaseViewController: UIViewController {
                     .filter() { (device) -> Bool in
                         return device.publicIdentityKeyData != nil && device.trustLevel != .removed
                     }
+                    .sorted(by: { (device1, device2) -> Bool in
+                        return device1.lastSeenDate.compare(device2.lastSeenDate) == .orderedDescending
+                    })
 
                 if let account = buddy.account(with: transaction) {
                     self.otrFingerprints = OTRProtocolManager.encryptionManager.otrKit.fingerprints(
@@ -165,7 +168,7 @@ class ZomFingerprintBaseViewController: UIViewController {
     }
 
     /**
-     - returns: the buddy' `displayName` or "your buddy" as a default value, if no buddy or no
+     - returns: the buddy's `displayName` or "your buddy" as a default value, if no buddy or no
                 `displayName`.
     */
     func buddyName() -> String {

Zom/Zom/Classes/View Controllers/ZomVerificationDetailViewController.swift

@@ -24,8 +24,8 @@ class ZomVerificationDetailViewController: ZomFingerprintBaseViewController, UIT
         super.viewDidLoad()
 
         if let titleView = navigationItem.titleView as? OTRTitleSubtitleView {
-            titleView.titleLabel.text = NSLocalizedString("Zom Codes",
-                                                          comment: "Title for code verification detail scene")
+            titleView.titleLabel.text = NSLocalizedString("Zom Codes", comment:
+                "Title for code verification detail scene")
         }
 
         descriptionLb.text = NSLocalizedString("Make sure the codes match your friend's latest Zom codes on his or her phone.",

Zom/Zom/Classes/View Controllers/ZomVerificationViewController.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -38,17 +38,17 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Make sure this code matches your friend's latest Zom code on their phone." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pQj-g6-Lix">
-                    <rect key="frame" x="32" y="70" width="311" height="42"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Make sure this code matches your friend's latest Zom code on their phone." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pQj-g6-Lix">
+                    <rect key="frame" x="32" y="70" width="311" height="63"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="42" id="jph-QX-uLf"/>
+                        <constraint firstAttribute="height" constant="63" id="jph-QX-uLf"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="15a-lX-bqI">
-                    <rect key="frame" x="32" y="137" width="311" height="52"/>
+                    <rect key="frame" x="32" y="158" width="311" height="52"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="52" id="uGJ-Mp-Uxa"/>
                     </constraints>
@@ -57,7 +57,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3AC-GN-Shv">
-                    <rect key="frame" x="127.5" y="214" width="120" height="86"/>
+                    <rect key="frame" x="127.5" y="235" width="120" height="86"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sLb-YK-B9j" customClass="HighlightableButton" customModule="Zom" customModuleProvider="target">
                             <rect key="frame" x="34" y="0.0" width="86" height="86"/>
@@ -135,7 +135,7 @@
                     </constraints>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qYY-tY-GBa">
-                    <rect key="frame" x="108.5" y="350" width="157" height="33"/>
+                    <rect key="frame" x="108.5" y="371" width="157" height="33"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <state key="normal" title="Code Doesn't Match">
                         <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -145,7 +145,7 @@
                     </connections>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PIj-MT-eve">
-                    <rect key="frame" x="157" y="391" width="61" height="33"/>
+                    <rect key="frame" x="157" y="412" width="61" height="33"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <state key="normal" title="View All">
                         <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>