Merge pull request #286 from mattrubin/develop

Release Authenticator 2.0.5

Author: mattrubin

.travis.yml

@@ -5,14 +5,16 @@ language: objective-c
 xcode_workspace: Authenticator.xcworkspace
 xcode_scheme: Authenticator
 
-osx_image: xcode9.3
+osx_image: xcode10
 
 env:
   - RUNTIME="iOS 9.0"  DEVICE="iPhone 4s"
   - RUNTIME="iOS 9.3"  DEVICE="iPhone 6s"
   - RUNTIME="iOS 10.0" DEVICE="iPhone SE"
   - RUNTIME="iOS 10.3" DEVICE="iPhone 7 Plus"
-  - RUNTIME="iOS 11.0" DEVICE="iPhone X"
+  - RUNTIME="iOS 11.0" DEVICE="iPhone 8"
+  - RUNTIME="iOS 11.4" DEVICE="iPhone X"
+  - RUNTIME="iOS 12.0" DEVICE="iPhone XS Max"
 
 install:
   - git submodule update --init --recursive

Authenticator.xcodeproj/project.pbxproj

@@ -107,6 +107,8 @@
 		8B2B8AE1118BA49F00437315 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
 		8BF5147F118799AE005C936F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		C910ADC01BF0315A00C988F5 /* TokenList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenList.swift; sourceTree = "<group>"; };
+		C91CDAEE214EEA82006488F7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C91CDAFD214EF044006488F7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		C9204A841E886A3500998D3E /* Acknowledgements.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Acknowledgements.html; sourceTree = "<group>"; };
 		C92708AB19CFB0750033128B /* TokenListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenListViewController.swift; sourceTree = "<group>"; };
 		C931A5FC1BFF6F9D00706A1C /* .hound.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .hound.yml; sourceTree = "<group>"; };
@@ -421,6 +423,7 @@
 		C9906A331812522100BAEF53 /* AuthenticatorTests */ = {
 			isa = PBXGroup;
 			children = (
+				C91CDAEE214EEA82006488F7 /* Info.plist */,
 				C983AB73197F98FC00975003 /* OTPAuthenticatorTests.m */,
 				C9A1C1CD1E6CDBFB009E65D6 /* RootTests.swift */,
 				CCC409751DB28BFE000A050D /* TableDiffTests.swift */,
@@ -448,6 +451,7 @@
 		C9A262CE1E170BD4004E6CEB /* AuthenticatorScreenshots */ = {
 			isa = PBXGroup;
 			children = (
+				C91CDAFD214EF044006488F7 /* Info.plist */,
 				C9A262CF1E170BD4004E6CEB /* AuthenticatorScreenshots.swift */,
 				C9A262D71E170E3A004E6CEB /* SnapshotHelper.swift */,
 			);
@@ -570,7 +574,7 @@
 			attributes = {
 				CLASSPREFIX = OTP;
 				LastSwiftMigration = 0700;
-				LastSwiftUpdateCheck = 0820;
+				LastSwiftUpdateCheck = 1000;
 				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Matt Rubin";
 				TargetAttributes = {
@@ -805,6 +809,7 @@
 			baseConfigurationReference = C944A5731A7F772600E08B1E /* iOS-Application.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Authenticator.app/Authenticator";
+				INFOPLIST_FILE = AuthenticatorTests/Info.plist;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 			};
@@ -815,6 +820,7 @@
 			baseConfigurationReference = C944A5731A7F772600E08B1E /* iOS-Application.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Authenticator.app/Authenticator";
+				INFOPLIST_FILE = AuthenticatorTests/Info.plist;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 			};
@@ -824,6 +830,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C944A5731A7F772600E08B1E /* iOS-Application.xcconfig */;
 			buildSettings = {
+				INFOPLIST_FILE = AuthenticatorScreenshots/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				PRODUCT_BUNDLE_IDENTIFIER = me.mattrubin.authenticator.screenshots;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -835,6 +842,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C944A5731A7F772600E08B1E /* iOS-Application.xcconfig */;
 			buildSettings = {
+				INFOPLIST_FILE = AuthenticatorScreenshots/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				PRODUCT_BUNDLE_IDENTIFIER = me.mattrubin.authenticator.screenshots;
 				PRODUCT_NAME = "$(TARGET_NAME)";

Authenticator.xcodeproj/xcshareddata/xcschemes/Authenticator Demo.xcscheme

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

Authenticator.xcodeproj/xcshareddata/xcschemes/Authenticator.xcscheme

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

Authenticator/Resources/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.4</string>
+	<string>2.0.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

Authenticator/Source/AppController.swift

@@ -2,7 +2,7 @@
 //  AppController.swift
 //  Authenticator
 //
-//  Copyright (c) 2016-2017 Authenticator authors
+//  Copyright (c) 2016-2018 Authenticator authors
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -148,12 +148,7 @@ class AppController {
             }
 
         case let .deletePersistentToken(persistentToken, failure):
-            do {
-                try store.deletePersistentToken(persistentToken)
-                updateView()
-            } catch {
-                handleEvent(failure(error))
-            }
+            confirmDeletion(of: persistentToken, failure: failure)
 
         case let .showErrorMessage(message):
             SVProgressHUD.showError(withStatus: message)
@@ -205,6 +200,44 @@ class AppController {
     func addTokenFromURL(_ token: Token) {
         handleAction(.addTokenFromURL(token))
     }
+
+    private func confirmDeletion(of persistentToken: PersistentToken, failure: @escaping (Error) -> Root.Event) {
+        let messagePrefix = persistentToken.token.displayName.map({ "The token “\($0)”" }) ?? "The unnamed token"
+        let message = messagePrefix + " will be permanently deleted from this device."
+
+        let alert = UIAlertController(title: "Delete Token?", message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "Delete", style: .destructive, handler: { [weak self] _ in
+            self?.permanentlyDelete(persistentToken, failure: failure)
+        }))
+        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+
+        let presenter = topViewController(presentedFrom: rootViewController)
+        presenter.present(alert, animated: true)
+    }
+
+    private func permanentlyDelete(_ persistentToken: PersistentToken, failure: @escaping (Error) -> Root.Event) {
+        do {
+            try store.deletePersistentToken(persistentToken)
+            updateView()
+        } catch {
+            handleEvent(failure(error))
+        }
+    }
+}
+
+private extension Token {
+    var displayName: String? {
+        switch (!name.isEmpty, !issuer.isEmpty) {
+        case (true, true):
+            return "\(issuer): \(name)"
+        case (true, false):
+            return name
+        case (false, true):
+            return issuer
+        case (false, false):
+            return nil
+        }
+    }
 }
 
 private extension DisplayTime {

AuthenticatorScreenshots/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>0</string>
+</dict>
+</plist>

AuthenticatorTests/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>0</string>
+</dict>
+</plist>

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to the project will be documented in this file.
 [Authenticator]: https://github.com/mattrubin/Authenticator
 
 
+## [2.0.5] - 2018-09-17
+- Added an alert to ask the user for confirmation before permanently deleting a token.
+([#217](https://github.com/mattrubin/Authenticator/pull/217))
+
+
 ## [2.0.4] - 2018-04-29
 - Fixed a crash on launch for some users, caused by deserialization errors when loading persistent tokens from the keychain.
 ([#277](https://github.com/mattrubin/Authenticator/issues/277))
@@ -107,7 +112,8 @@ For security reasons, tokens are stored only on one device, and are not included
 ## [1.0] - 2013-11-25
 
 
-[Unreleased]: https://github.com/mattrubin/Authenticator/compare/2.0.4...HEAD
+[Unreleased]: https://github.com/mattrubin/Authenticator/compare/2.0.5...HEAD
+[2.0.5]: https://github.com/mattrubin/Authenticator/compare/2.0.4...2.0.5
 [2.0.4]: https://github.com/mattrubin/Authenticator/compare/2.0.3...2.0.4
 [2.0.3]: https://github.com/mattrubin/Authenticator/compare/2.0.2...2.0.3
 [2.0.2]: https://github.com/mattrubin/Authenticator/compare/2.0.1...2.0.2

Cartfile

@@ -1,4 +1,4 @@
 # Configuration for Carthage (https://github.com/Carthage/Carthage)
 
-github "mattrubin/OneTimePassword" ~> 3.1.3
+github "mattrubin/OneTimePassword" ~> 3.1.4
 github "SVProgressHUD/SVProgressHUD" ~> 2.0