Merge pull request #1098 from ChatSecure/xcode_10.2

Xcode 10.2

Author: chrisballinger

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode10.1
+osx_image: xcode10.2
 language: objective-c
 
 # Handle git submodules yourself
@@ -9,7 +9,7 @@ git:
 # Use sed to replace the SSH URL with the public URL, then initialize submodules
 before_install:
   # Fix Travis  xcodebuild exited with 65 https://github.com/travis-ci/travis-ci/issues/6675#issuecomment-257964767
-  - export IOS_SIMULATOR_UDID=`instruments -s devices | grep -m 1 "iPhone 8 (11" | awk -F '[ ]' '{print $4}' | awk -F '[\[]' '{print $2}' | sed 's/.$//'`
+  - export IOS_SIMULATOR_UDID=`instruments -s devices | grep -m 1 "iPhone 8 (12" | awk -F '[ ]' '{print $4}' | awk -F '[\[]' '{print $2}' | sed 's/.$//'`
   - echo $IOS_SIMULATOR_UDID
   - bundle install # We need a pre-release CocoaPods version
   - sed -i -e 's/[email protected]:/git:\/\/github.com\//' .gitmodules

Cartfile.resolved

@@ -2,7 +2,7 @@ github "AFNetworking/AFNetworking" "3.2.1"
 github "Mantle/Mantle" "098746782c421837a154b3defcf7bc26331f18ba"
 github "PureLayout/PureLayout" "v3.1.4"
 github "TTTAttributedLabel/TTTAttributedLabel" "2.0.0"
-github "TheLevelUp/ZXingObjC" "3.6.3"
+github "TheLevelUp/ZXingObjC" "3.6.4"
 github "facebook/KVOController" "v1.2.0"
 github "jdg/MBProgressHUD" "1.1.0"
 github "mattt/FormatterKit" "1.8.2"

ChatSecure.xcodeproj/project.pbxproj

@@ -2513,7 +2513,7 @@
 			};
 			buildConfigurationList = 6396AF951A169D54009F3E6C /* Build configuration list for PBXProject "ChatSecure" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -2906,7 +2906,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $CONFIGURATION = \"Debug\" ]; then\n${PODS_ROOT}/LicensePlist/license-plist --output-path $PRODUCT_NAME/Settings.bundle --add-version-numbers --suppress-opening-directory\nfi\n";
+			shellScript = "if [ $CONFIGURATION = \"Debug\" ]; then\n${PODS_ROOT}/LicensePlist/license-plist --output-path $PRODUCT_NAME/Settings.bundle --add-version-numbers --suppress-opening-directory || true\nfi\n";
 		};
 		D97B6BA21E4A869C005C7B11 /* Update OTRStrings from strings.json */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -3459,7 +3459,7 @@
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = debugging;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -3511,7 +3511,7 @@
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = debugging;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureCore.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ChatSecure/Classes/Categories/NSData+ChatSecure.swift

@@ -9,14 +9,14 @@
 import Foundation
 
 
-public extension NSData {
+extension NSData {
     @objc public func hexString() -> String {
         return (self as Data).hexString()
     }
 }
 
 // http://stackoverflow.com/a/26502285/805882
-public extension NSString {
+extension NSString {
 
     /// Create `Data` from hexadecimal string representation
     ///

ChatSecure/Classes/Categories/UIApplication+ChatSecure.swift

@@ -49,7 +49,7 @@ extension NotificationType: RawRepresentable {
     public typealias RawValue = String
 }
 
-public extension UIApplication {
+extension UIApplication {
 
     /// Removes all but one foreground notifications for typing and message events sent from APNS
     @objc public func removeExtraForegroundNotifications() {
@@ -296,6 +296,8 @@ public extension UIApplication {
             case .otherError:
                 // this is probably a SSL error
                 body = body + " \(CONNECTION_ERROR_CERTIFICATE_VERIFY_STRING())"
+            @unknown default:
+                return
             }
         } else if error.domain == "kCFStreamErrorDomainSSL" {
             body = body + " \(CONNECTION_ERROR_CERTIFICATE_VERIFY_STRING())"

ChatSecure/Classes/Categories/UINavigationController+ChatSecure.swift

@@ -10,7 +10,7 @@ import Foundation
 import UIKit
 
 
-public extension UINavigationController {
+extension UINavigationController {
 
     @objc public func otr_baseViewContorllers() -> [UIViewController] {
         var result:[UIViewController] = []