Merge pull request #393 from agilebits/kyle/update-demos-to-swift4

Update Swift demos for Swift 4 and Xcode 9

Author: Kyle Swank

Demos/App Demo for iOS Swift/App Demo for iOS Swift.xcodeproj/project.pbxproj

@@ -115,7 +115,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0910;
 				ORGANIZATIONNAME = Agilebits;
 				TargetAttributes = {
 					F1B11CE61ACA827600BBB963 = {
@@ -191,13 +191,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -206,6 +214,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -237,13 +246,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -252,6 +269,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -261,6 +279,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -278,7 +297,7 @@
 				PRODUCT_NAME = "App Demo for iOS Swift";
 				SWIFT_OBJC_BRIDGING_HEADER = "App Demo for iOS Swift/App Demo for iOS Swift-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -293,7 +312,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.agilebits.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "App Demo for iOS Swift";
 				SWIFT_OBJC_BRIDGING_HEADER = "App Demo for iOS Swift/App Demo for iOS Swift-Bridging-Header.h";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

Demos/App Demo for iOS Swift/App Demo for iOS Swift/AppDelegate.swift

@@ -13,30 +13,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 	var window: UIWindow?
 
-	func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
 		// Override point for customization after application launch.
 		return true
 	}
 
-	func applicationWillResignActive(application: UIApplication) {
+	func applicationWillResignActive(_ application: UIApplication) {
 		// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
 		// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
 	}
 
-	func applicationDidEnterBackground(application: UIApplication) {
+	func applicationDidEnterBackground(_ application: UIApplication) {
 		// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
 		// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 	}
 
-	func applicationWillEnterForeground(application: UIApplication) {
+	func applicationWillEnterForeground(_ application: UIApplication) {
 		// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
 	}
 
-	func applicationDidBecomeActive(application: UIApplication) {
+	func applicationDidBecomeActive(_ application: UIApplication) {
 		// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 	}
 
-	func applicationWillTerminate(application: UIApplication) {
+	func applicationWillTerminate(_ application: UIApplication) {
 		// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 		// Saves changes in the application's managed object context before the application terminates.
 	}

Demos/App Demo for iOS Swift/App Demo for iOS Swift/ChangePasswordViewController.swift

@@ -21,31 +21,33 @@ class ChangePasswordViewController: UIViewController {
 			self.view.backgroundColor = UIColor(patternImage: patternImage)
 		}
 
-		self.onepasswordButton.hidden = (false == OnePasswordExtension.sharedExtension().isAppExtensionAvailable())
+		onepasswordButton.isHidden = (false == OnePasswordExtension.shared().isAppExtensionAvailable())
 	}
 
-	override func preferredStatusBarStyle() -> UIStatusBarStyle {
-		return UIStatusBarStyle.LightContent
+	override var preferredStatusBarStyle: UIStatusBarStyle {
+		return .lightContent
 	}
 
-	@IBAction func changePasswordIn1Password(sender:AnyObject) -> Void {
-		let changedPassword = self.freshPasswordTextField.text!
-		let oldPassword = self.oldPasswordTextField.text!
-		let confirmationPassword = self.confirmPasswordTextField.text!
+	@IBAction func changePasswordIn1Password(_ sender:AnyObject) {
+		guard let changedPassword = freshPasswordTextField.text,
+			let oldPassword = oldPasswordTextField.text,
+			let confirmationPassword = confirmPasswordTextField.text else {
+				return
+		}
 
 		// Validate that the new password and the old password are not the same.
-		if (oldPassword.characters.count > 0 && oldPassword == changedPassword) {
-			self.showChangePasswordFailedAlertWithMessage("The old and the new password must not be the same")
+		if (oldPassword.count > 0 && oldPassword == changedPassword) {
+			showChangePasswordFailedAlertWithMessage(message: "The old and the new password must not be the same")
 			return
 		}
 
 		// Validate that the new and confirmation passwords match.
-		if (changedPassword.characters.count > 0 && changedPassword != confirmationPassword) {
-			self.showChangePasswordFailedAlertWithMessage("The new passwords and the confirmation password must match")
+		if (changedPassword.count > 0 && changedPassword != confirmationPassword) {
+			showChangePasswordFailedAlertWithMessage(message: "The new passwords and the confirmation password must match")
 			return
 		}
 
-		let newLoginDetails:[String: AnyObject] = [
+		let newLoginDetails:[String : Any] = [
 			AppExtensionTitleKey: "ACME", // Optional, used for the third schenario only
 			AppExtensionUsernameKey: "aUsername", // Optional, used for the third schenario only
 			AppExtensionPasswordKey: changedPassword,
@@ -54,50 +56,50 @@ class ChangePasswordViewController: UIViewController {
 		]
 
 		// The password generation options are optional, but are very handy in case you have strict rules about password lengths, symbols and digits.
-		let passwordGenerationOptions:[String: AnyObject] = [
+		let passwordGenerationOptions:[String : AnyObject] = [
 			// The minimum password length can be 4 or more.
-			AppExtensionGeneratedPasswordMinLengthKey: (8),
+			AppExtensionGeneratedPasswordMinLengthKey: (8 as NSNumber),
 
 			// The maximum password length can be 50 or less.
-			AppExtensionGeneratedPasswordMaxLengthKey: (30),
+			AppExtensionGeneratedPasswordMaxLengthKey: (30 as NSNumber),
 
 			// If YES, the 1Password will guarantee that the generated password will contain at least one digit (number between 0 and 9). Passing NO will not exclude digits from the generated password.
-			AppExtensionGeneratedPasswordRequireDigitsKey: (true),
+			AppExtensionGeneratedPasswordRequireDigitsKey: (true as NSNumber),
 
 			// If YES, the 1Password will guarantee that the generated password will contain at least one symbol (See the list below). Passing NO will not exclude symbols from the generated password.
-			AppExtensionGeneratedPasswordRequireSymbolsKey: (true),
+			AppExtensionGeneratedPasswordRequireSymbolsKey: (true as NSNumber),
 
 			// Here are all the symbols available in the the 1Password Password Generator:
 			// !@#$%^&*()_-+=|[]{}'\";.,>?/~`
 			// The string for AppExtensionGeneratedPasswordForbiddenCharactersKey should contain the symbols and characters that you wish 1Password to exclude from the generated password.
-			AppExtensionGeneratedPasswordForbiddenCharactersKey: "!@#$%/0lIO"
+			AppExtensionGeneratedPasswordForbiddenCharactersKey: "!@#$%/0lIO" as NSString
 		]
 
-		OnePasswordExtension.sharedExtension().changePasswordForLoginForURLString("https://www.acme.com", loginDetails: newLoginDetails, passwordGenerationOptions: passwordGenerationOptions, forViewController: self, sender: sender) { (loginDictionary, error) -> Void in
-			if loginDictionary == nil {
-				if error!.code != Int(AppExtensionErrorCodeCancelledByUser) {
-					print("Error invoking 1Password App Extension for find login: \(error)")
+		OnePasswordExtension.shared().changePasswordForLogin(forURLString: "https://www.acme.com", loginDetails: newLoginDetails, passwordGenerationOptions: passwordGenerationOptions, for: self, sender: sender) { (loginDictionary, error) in
+			guard let loginDictionary = loginDictionary else {
+				if let error = error as NSError?, error.code != AppExtensionErrorCodeCancelledByUser {
+					print("Error invoking 1Password App Extension for find login: \(String(describing: error))")
 				}
 				return
 			}
 
-			self.oldPasswordTextField.text = loginDictionary?[AppExtensionOldPasswordKey] as? String
-			self.freshPasswordTextField.text = loginDictionary?[AppExtensionPasswordKey] as? String
-			self.confirmPasswordTextField.text = loginDictionary?[AppExtensionPasswordKey] as? String
+			self.oldPasswordTextField.text = loginDictionary[AppExtensionOldPasswordKey] as? String
+			self.freshPasswordTextField.text = loginDictionary[AppExtensionPasswordKey] as? String
+			self.confirmPasswordTextField.text = loginDictionary[AppExtensionPasswordKey] as? String
 		}
 	}
 
 	// Convenience function
-	func showChangePasswordFailedAlertWithMessage(message:String) -> Void {
-		let alertController = UIAlertController(title: "Change Password Error", message: message, preferredStyle: UIAlertControllerStyle.Alert)
+	func showChangePasswordFailedAlertWithMessage(message:String) {
+		let alertController = UIAlertController(title: "Change Password Error", message: message, preferredStyle: .alert)
 
-		let dismissAction = UIAlertAction(title: "Cancel", style: UIAlertActionStyle.Cancel) { (action) -> Void in
+		let dismissAction = UIAlertAction(title: "Cancel", style: .cancel) { action in
 			self.freshPasswordTextField.text = ""
 			self.confirmPasswordTextField.text = ""
 			self.freshPasswordTextField.becomeFirstResponder()
 		}
 
 		alertController.addAction(dismissAction)
-		self.presentViewController(alertController, animated: true, completion: nil)
+		self.present(alertController, animated: true, completion: nil)
 	}
 }

Demos/App Demo for iOS Swift/App Demo for iOS Swift/LoginViewController.swift

@@ -22,50 +22,49 @@ class LoginViewController: UIViewController {
 			self.view.backgroundColor = UIColor(patternImage: patternImage)
 		}
 
-		self.onepasswordButton.hidden = (false == OnePasswordExtension.sharedExtension().isAppExtensionAvailable())
+		onepasswordButton.isHidden = (false == OnePasswordExtension.shared().isAppExtensionAvailable())
 	}
 
-	override func viewDidAppear(animated: Bool) {
+	override func viewDidAppear(_ animated: Bool) {
 		super.viewDidAppear(animated)
-		if OnePasswordExtension.sharedExtension().isAppExtensionAvailable() == false {
-			let alertController = UIAlertController(title: "1Password is not installed", message: "Get 1Password from the App Store", preferredStyle: UIAlertControllerStyle.Alert)
+		if OnePasswordExtension.shared().isAppExtensionAvailable() == false {
+			let alertController = UIAlertController(title: "1Password is not installed", message: "Get 1Password from the App Store", preferredStyle: UIAlertControllerStyle.alert)
 
-			let cancelAction = UIAlertAction(title: "Cancel", style: .Cancel, handler: nil)
+			let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
 			alertController.addAction(cancelAction)
 
-			let OKAction = UIAlertAction(title: "Get 1Password", style: .Default) { (action) in UIApplication.sharedApplication().openURL(NSURL(string: "https://itunes.apple.com/app/1password-password-manager/id568903335")!)
+			let OKAction = UIAlertAction(title: "Get 1Password", style: .default) { (action) in UIApplication.shared.openURL(URL(string: "https://itunes.apple.com/app/1password-password-manager/id568903335")!)
 			}
 
 			alertController.addAction(OKAction)
-			self.presentViewController(alertController, animated: true, completion: nil)
+			self.present(alertController, animated: true, completion: nil)
 		}
 	}
 
-	override func preferredStatusBarStyle() -> UIStatusBarStyle {
-		return UIStatusBarStyle.LightContent
+	override var preferredStatusBarStyle: UIStatusBarStyle {
+		return .lightContent
 	}
 
-	@IBAction func findLoginFrom1Password(sender:AnyObject) -> Void {
-		OnePasswordExtension.sharedExtension().findLoginForURLString("https://www.acme.com", forViewController: self, sender: sender, completion: { (loginDictionary, error) -> Void in
-			if loginDictionary == nil {
-				if error!.code != Int(AppExtensionErrorCodeCancelledByUser) {
-					print("Error invoking 1Password App Extension for find login: \(error)")
+	@IBAction func findLoginFrom1Password(_ sender:AnyObject) {
+		OnePasswordExtension.shared().findLogin(forURLString: "https://www.acme.com", for: self, sender: sender, completion: { (loginDictionary, error) in
+			guard let loginDictionary = loginDictionary else {
+				if let error = error as NSError?, error.code != AppExtensionErrorCodeCancelledByUser {
+					print("Error invoking 1Password App Extension for find login: \(String(describing: error))")
 				}
 				return
 			}
 
-			self.usernameTextField.text = loginDictionary?[AppExtensionUsernameKey] as? String
-			self.passwordTextField.text = loginDictionary?[AppExtensionPasswordKey] as? String
+			self.usernameTextField.text = loginDictionary[AppExtensionUsernameKey] as? String
+			self.passwordTextField.text = loginDictionary[AppExtensionPasswordKey] as? String
 
-			if let generatedOneTimePassword = loginDictionary?[AppExtensionTOTPKey] as? String {
-				self.oneTimePasswordTextField.hidden = false
+			if let generatedOneTimePassword = loginDictionary[AppExtensionTOTPKey] as? String {
+				self.oneTimePasswordTextField.isHidden = false
 				self.oneTimePasswordTextField.text = generatedOneTimePassword
 
 				// Important: It is recommended that you submit the OTP/TOTP to your validation server as soon as you receive it, otherwise it may expire.
-				let delayTime = dispatch_time(DISPATCH_TIME_NOW, Int64(0.5 * Double(NSEC_PER_SEC)))
-				dispatch_after(delayTime, dispatch_get_main_queue(), { () -> Void in
-					self.performSegueWithIdentifier("showThankYouViewController", sender: self)
-				})
+				let delayTime: DispatchTime = .now() + DispatchTimeInterval.milliseconds(500)
+				DispatchQueue.main.asyncAfter(deadline: delayTime) {					self.performSegue(withIdentifier: "showThankYouViewController", sender: self)
+				}
 			}
 
 		})