Feature/swift3 (#235)

* Bump components

* Updated dependencies

* WIP

* Auto conversion

* Conversion

* Post-Automatic conversion

* Conversion WIP2

* Building version

* !! Commented classes that crash swift compiler !!

* Porting tests WIP

* Tests WIP

* Fix some runtime crashes introduces by the Swift 3 migrator

* Annotate `Button` initializer as nonnull

* Tests compilation

* Corrected random compilation bug

* Fixed ArticleView compilation

* ProfileClientViewController compilation

* Fixed crashes

* Check if AVExportSession initializer returned nil

This is to make sure to workaround this issue: http://stackoverflow.com/questions/39539894/avassetsession-initasset-avasset-presetname-string-returns-nil

* Fixed tests crashing

* Updated correct snapshots

* Add NSPhotoLibraryUsageDescription to Info.plist, update dependencies

* Location tests fix

* Temporarily green all tests

* TEMPORARILY disable AVS on simulator

* Added request strategy

* Removed unnecessary code

Author: mikeger

Cartfile

@@ -1,13 +1,13 @@
-github "wireapp/wire-ios-ziphy" ~> 3.0
+github "wireapp/wire-ios-ziphy" ~> 4.0.1
 github "wireapp/SmoothLineView" "0.1.12-wire-ft"
 github "wireapp/TSMarkdownParser" ~> 1.0.17
 github "wireapp/Classy" "v0.2.6"
-github "wireapp/CocoaLumberjack" "2.2.1-wire"
-github "wireapp/Cartography" "z0.6.1"
+github "wireapp/CocoaLumberjack" "2.4.0-swift3"
+github "wireapp/Cartography" "z0.6.1-swift3"
 github "wireapp/TTTAttributedLabel" "2.0.0"
-github "wireapp/ZipArchive" ~> 1.3
+github "wireapp/ZipArchive" "1.6.1-swift3"
 github "wireapp/HockeySDK-iOS" "4.0.1"
-github "wireapp/wire-ios-sync-engine" ~> 52.7.0
+github "wireapp/wire-ios-sync-engine" ~> 53.0.0
 github "wireapp/onepassword-app-extension" "framework/1.8.2"
 github "wireapp/FormatterKit" ~> 1.8.1
 github "wireapp/VIMNetworking" "v6.0.2-wire-carthage-2"

Cartfile.private

@@ -1,3 +1,3 @@
 github "wireapp/ocmock" == 3.1.3
-github "wireapp/ios-snapshot-test-case" == 2.1.0
+github "wireapp/ios-snapshot-test-case" "2.1.3-swift3"
 

Cartfile.resolved

@@ -1,28 +1,29 @@
 github "wireapp/AFNetworking" "2.6.3-iOS8"
-github "wireapp/Cartography" "z0.6.1"
+github "wireapp/Cartography" "z0.6.1-swift3"
 github "wireapp/Classy" "v0.2.6"
-github "wireapp/CocoaLumberjack" "2.2.1-wire"
+github "wireapp/CocoaLumberjack" "2.4.0-swift3"
 github "wireapp/FormatterKit" "1.8.1"
 github "wireapp/HockeySDK-iOS" "4.0.1"
 github "wireapp/PINCache" "2.3"
 github "wireapp/SmoothLineView" "0.1.12-wire-ft"
 github "wireapp/TSMarkdownParser" "1.0.17"
 github "wireapp/TTTAttributedLabel" "2.0.0"
 github "wireapp/VIMNetworking" "v6.0.2-wire-carthage-2"
-github "wireapp/ZipArchive" "v1.3"
-github "wireapp/ios-snapshot-test-case" "2.1.0"
+github "wireapp/ZipArchive" "1.6.1-swift3"
+github "wireapp/ios-snapshot-test-case" "2.1.3-swift3"
 github "wireapp/libPhoneNumber-iOS" "0.8.12"
 github "wireapp/ocmock" "v3.1.3"
 github "wireapp/onepassword-app-extension" "framework/1.8.2"
-github "wireapp/ono" "1.2.3"
-github "wireapp/protobuf-objc" "1.9.11"
-github "wireapp/wire-ios-cryptobox" "3.1.4"
-github "wireapp/wire-ios-system" "14.40.4"
-github "wireapp/wire-ios-ziphy" "3.0.2"
-github "wireapp/wire-ios-link-preview" "3.7.0"
-github "wireapp/wire-ios-utilities" "10.30.3"
-github "wireapp/wire-ios-images" "4.18.5"
-github "wireapp/wire-ios-transport" "9.0.1"
-github "wireapp/wire-ios-protos" "6.4.2"
-github "wireapp/wire-ios-data-model" "17.0.4"
-github "wireapp/wire-ios-sync-engine" "52.7.0"
+github "wireapp/ono" "1.3.0"
+github "wireapp/protobuf-objc" "1.9.12"
+github "wireapp/wire-ios-cryptobox" "4.0.0"
+github "wireapp/wire-ios-system" "15.0.0"
+github "wireapp/wire-ios-ziphy" "4.0.1"
+github "wireapp/wire-ios-link-preview" "4.0.1"
+github "wireapp/wire-ios-utilities" "11.0.3"
+github "wireapp/wire-ios-images" "5.0.0"
+github "wireapp/wire-ios-transport" "11.2.2"
+github "wireapp/wire-ios-protos" "7.2.1"
+github "wireapp/wire-ios-data-model" "18.1.0"
+github "wireapp/wire-ios-request-strategy" "2.0.1"
+github "wireapp/wire-ios-sync-engine" "53.0.0"

Wire-Sharing-Extension-iOS/ConversationListCell.swift

@@ -67,15 +67,15 @@ class ConversationListCell: UITableViewCell {
         }
     }
 
-    @IBOutlet private weak var conversationNameLabel: UILabel!
-    @IBOutlet private weak var conversationAvatarView: AvatarImageView!
+    @IBOutlet fileprivate weak var conversationNameLabel: UILabel!
+    @IBOutlet fileprivate weak var conversationAvatarView: AvatarImageView!
 
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
     }
 
-    override func setSelected(selected: Bool, animated: Bool) {
+    override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
 
         // Configure the view for the selected state

Wire-Sharing-Extension-iOS/ConversationListViewController.swift

@@ -26,47 +26,47 @@ import Classy
 
 
 @objc protocol ConversationListViewControllerDelegate {
-    optional func conversationList(conversationList: ConversationListViewController, didSelectConversation conversation:Conversation)
+    optional func conversationList(_ conversationList: ConversationListViewController, didSelectConversation conversation:Conversation)
 }
 
 
 
 class ConversationListViewController: UITableViewController {
 
-    @IBOutlet private weak var backButton: IconButton!
-    @IBOutlet private weak var cancelButton: IconButton!
+    @IBOutlet fileprivate weak var backButton: IconButton!
+    @IBOutlet fileprivate weak var cancelButton: IconButton!
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
         self.tableView.estimatedRowHeight = 52.0
         self.tableView.rowHeight = UITableViewAutomaticDimension
 
-        let image = UIImage(forLogoWithColor: UIColor.accentColor, iconSize: .Medium)
+        let image = UIImage(forLogoWith: UIColor.accentColor, iconSize: .medium)
         self.navigationItem.titleView = UIImageView(image: image)
 
-        self.cancelButton.setIcon(.X, withSize: .Tiny, forState: .Normal)
-        self.backButton.setIcon(.ChevronLeft, withSize: .Tiny, forState: .Normal)
+        self.cancelButton.setIcon(.X, with: .tiny, for: UIControlState())
+        self.backButton.setIcon(.chevronLeft, with: .tiny, for: UIControlState())
 
-        let barButtonOffset: CGFloat = (self.traitCollection.userInterfaceIdiom == .Phone) ? 8 : 4
+        let barButtonOffset: CGFloat = (self.traitCollection.userInterfaceIdiom == .phone) ? 8 : 4
         if let leftItem = self.navigationItem.leftBarButtonItem {
-            let leftSpacer = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FixedSpace, target: nil, action: nil)
+            let leftSpacer = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.fixedSpace, target: nil, action: nil)
             leftSpacer.width = barButtonOffset
             self.navigationItem.leftBarButtonItems = [leftSpacer, leftItem]
         }
 
         if let rightItem = self.navigationItem.rightBarButtonItem {
-            let rightSpacer = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FixedSpace, target: nil, action: nil)
+            let rightSpacer = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.fixedSpace, target: nil, action: nil)
             rightSpacer.width = barButtonOffset
             self.navigationItem.rightBarButtonItems = [rightSpacer, rightItem]
         }
     }
 
-    override func viewWillAppear(animated: Bool) {
+    override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
     }
 
-    override func viewDidAppear(animated: Bool) {
+    override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
         // Following manual Classy update is a workarround for a bug:
@@ -89,29 +89,29 @@ class ConversationListViewController: UITableViewController {
     var searchTerm: String = "" {
         didSet {
             self.tableView.reloadData()
-            if (self.tableView.numberOfRowsInSection(0) > 0) {
-                self.tableView.scrollToRowAtIndexPath(NSIndexPath(forRow: 0, inSection: 0), atScrollPosition: .Top, animated: false)
+            if (self.tableView.numberOfRows(inSection: 0) > 0) {
+                self.tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
             }
         }
     }
 
     var excludedConversations: Array<Conversation> = [] {
         didSet {
             self.tableView.reloadData()
-            if (self.tableView.numberOfRowsInSection(0) > 0) {
-                self.tableView.scrollToRowAtIndexPath(NSIndexPath(forRow: 0, inSection: 0), atScrollPosition: .Top, animated: false)
+            if (self.tableView.numberOfRows(inSection: 0) > 0) {
+                self.tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
             }
         }
     }
 
     // MARK: - Actions
 
-    @IBAction func backButtonPressed(sender: AnyObject) {
-        self.navigationController?.popViewControllerAnimated(true)
+    @IBAction func backButtonPressed(_ sender: AnyObject) {
+        self.navigationController?.popViewController(animated: true)
     }
 
-    @IBAction func cancelPressed(sender: AnyObject) {
-        self.extensionContext!.cancelRequestWithError(NSError(domain: NSCocoaErrorDomain, code: NSUserCancelledError, userInfo: nil))
+    @IBAction func cancelPressed(_ sender: AnyObject) {
+        self.extensionContext!.cancelRequest(withError: NSError(domain: NSCocoaErrorDomain, code: NSUserCancelledError, userInfo: nil))
     }
 
     // MARK: - API
@@ -158,16 +158,16 @@ class ConversationListViewController: UITableViewController {
 
     // MARK: - Table view data source
 
-    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }
 
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return self.filteredModel.count
     }
 
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCellWithIdentifier("ConversationListCell", forIndexPath: indexPath) as! ConversationListCell
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "ConversationListCell", for: indexPath) as! ConversationListCell
 
         let conversation = self.filteredModel[indexPath.row]
         cell.conversation = conversation
@@ -182,7 +182,7 @@ class ConversationListViewController: UITableViewController {
 
     // MARK: - Table view delegate
 
-    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         self.delegate?.conversationList?(self, didSelectConversation: self.filteredModel[indexPath.row])
     }
 

Wire-Sharing-Extension-iOS/ExtensionHelpers/Analytics.swift

@@ -37,32 +37,32 @@ enum AnalyticsEventAttribute {
     case cancel(String)
 
     func keyValue() -> (key: String, value: AnyObject) {
-        var keyValue: (String, AnyObject) = ("", 0)
+        var keyValue: (String, AnyObject) = ("", 0 as AnyObject)
         switch self {
-        case .numberOfImages(let value): keyValue = ("numberOfImages", value)
-        case .hasURL(let value): keyValue = ("hasURL", value)
-        case .hasText(let value): keyValue = ("hasText", value)
-        case .numberOfRecipients(let value): keyValue = ("numberOfRecipients", value)
-        case .numberOfGroupRecipients(let value): keyValue = ("numberOfGroupRecipients", value)
-        case .numberOfOneOnOneRecipients(let value): keyValue = ("numberOfOneOnOneRecipients", value)
-        case .cancel(let value): keyValue = ("cancel", value)
+        case .numberOfImages(let value): keyValue = ("numberOfImages", value as AnyObject)
+        case .hasURL(let value): keyValue = ("hasURL", value as AnyObject)
+        case .hasText(let value): keyValue = ("hasText", value as AnyObject)
+        case .numberOfRecipients(let value): keyValue = ("numberOfRecipients", value as AnyObject)
+        case .numberOfGroupRecipients(let value): keyValue = ("numberOfGroupRecipients", value as AnyObject)
+        case .numberOfOneOnOneRecipients(let value): keyValue = ("numberOfOneOnOneRecipients", value as AnyObject)
+        case .cancel(let value): keyValue = ("cancel", value as AnyObject)
         }
         return keyValue
     }
 }
 
 extension SharedAnalytics {
 
-    func tagEvent(name: String) {
+    func tagEvent(_ name: String) {
         self.tagEvent(name, attributes: nil)
     }
 
-    func tagEvent(name: String, attributes: [NSObject: AnyObject]?) {
+    func tagEvent(_ name: String, attributes: [AnyHashable: Any]?) {
         self.storeEvent(name, context: ShareExtensionContext, attributes: attributes)
     }
 
-    func tagEvent(event: AnalyticsEvent, attributes: [AnalyticsEventAttribute]) {
-        var attributeDict: [NSObject: AnyObject] = [:]
+    func tagEvent(_ event: AnalyticsEvent, attributes: [AnalyticsEventAttribute]) {
+        var attributeDict: [AnyHashable: Any] = [:]
         for attribute in attributes {
             let keyValue = attribute.keyValue()
             attributeDict[keyValue.key] = keyValue.value
@@ -71,4 +71,4 @@ extension SharedAnalytics {
         self.tagEvent(event.rawValue, attributes: attributeDict)
     }
 
-}
+}

Wire-Sharing-Extension-iOS/ExtensionHelpers/NSExtensionContext+Attachments.swift

@@ -40,10 +40,10 @@ extension NSExtensionContext {
         return self.providersWithType(kUTTypeImage)
     }
 
-    func providersWithType(type: CFString) -> [NSItemProvider] {
+    func providersWithType(_ type: CFString) -> [NSItemProvider] {
         var providers: [NSItemProvider] = []
         for extensionItem in self.extensionItems {
-            providers.insertContentsOf(extensionItem.providersWithType(type), at: providers.count)
+            providers.insert(extensionItem.providersWithType(type), at: providers.count)
         }
         return providers
     }

Wire-Sharing-Extension-iOS/ExtensionHelpers/NSExtensionItem+Attachments.swift

@@ -36,7 +36,7 @@ extension NSExtensionItem {
         return self.providersWithType(kUTTypeImage)
     }
 
-    func providersWithType(type: CFString) -> [NSItemProvider] {
+    func providersWithType(_ type: CFString) -> [NSItemProvider] {
         if let itemProviderAttachments = self.attachments as? [NSItemProvider] {
             return itemProviderAttachments.filter { $0.hasItemConformingToTypeIdentifier(type as String) }
         }

Wire-Sharing-Extension-iOS/ExtensionHelpers/NSItemProvider+Attachments.swift

@@ -24,38 +24,38 @@ import MobileCoreServices
 
 extension NSItemProvider {
 
-    func loadText(completion:(String) -> Void) {
+    func loadText(_ completion:@escaping (String) -> Void) {
         self.loadItemForTypeIdentifier(kUTTypePlainText) { (object: NSSecureCoding?, error: NSError!) -> Void in
             if let text = object as? String {
-                dispatch_async(dispatch_get_main_queue()) {
+                DispatchQueue.main.async {
                     completion(text)
                 }
             }
-        }
+        } as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void
     }
 
-    func loadURL(completion:(NSURL) -> Void) {
+    func loadURL(_ completion:@escaping (URL) -> Void) {
         self.loadItemForTypeIdentifier(kUTTypeURL) { (object: NSSecureCoding?, error: NSError!) -> Void in
-            if let url = object as? NSURL {
-                dispatch_async(dispatch_get_main_queue()) {
+            if let url = object as? URL {
+                DispatchQueue.main.async {
                     completion(url)
                 }
             }
-        }
+        } as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void
     }
 
-    func loadImage(completion:(object: NSSecureCoding) -> Void) {
+    func loadImage(_ completion:@escaping (_ object: NSSecureCoding) -> Void) {
         self.loadItemForTypeIdentifier(kUTTypeImage) { (object: NSSecureCoding?, error: NSError!) -> Void in
             if let imageObject = object {
-                dispatch_async(dispatch_get_main_queue()) {
-                    completion(object: imageObject)
+                DispatchQueue.main.async {
+                    completion(imageObject)
                 }
             }
-        }
+        } as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void as! (NSSecureCoding?, NSError?) -> Void
     }
 
-    private func loadItemForTypeIdentifier(typeIdentifier: CFString, completion:(object: NSSecureCoding?, error: NSError!) -> Void) {
-        self.loadItemForTypeIdentifier(typeIdentifier as String, options: [:], completionHandler: completion)
+    fileprivate func loadItemForTypeIdentifier(_ typeIdentifier: CFString, completion:@escaping (_ object: NSSecureCoding?, _ error: NSError?) -> Void) {
+        self.loadItem(forTypeIdentifier: typeIdentifier as String, options: [:], completionHandler: completion)
     }
 
 }

Wire-Sharing-Extension-iOS/ExtensionHelpers/NSString+URL.swift

@@ -19,14 +19,28 @@
 
 import Foundation
 
-extension NSString {
+public extension NSString {
     func containsURL() -> Bool {
         do {
-            let urlDetector = try NSDataDetector(types: NSTextCheckingType.Link.rawValue)
-            let matches = urlDetector.matchesInString(self as String, options: [], range: NSMakeRange(0, self.length))
+            let urlDetector = try NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
+            let matches = urlDetector.matches(in: self as String, options: [], range: NSMakeRange(0, self.length))
             return matches.count > 0
         } catch _ as NSError {
             return false
         }
     }
-}
+
+    // MARK: - URL Formatting
+
+    func removingPrefixWWW() -> String {
+        return replacingOccurrences(of: "www.", with: "", options: .anchored, range: NSMakeRange(0, self.length))
+    }
+
+    func removingTrailingForwardSlash() -> String {
+        return replacingOccurrences(of: "/", with: "", options: [.anchored, .backwards], range: NSMakeRange(0, self.length))
+    }
+
+    func removingURLScheme(_ scheme: String) -> String {
+        return replacingOccurrences(of: scheme + "://", with: "", options: .anchored, range: NSMakeRange(0, self.length))
+    }
+}