Fix issues with OTP notification (#517)

SimplyDanny · web-flow · commit 3eea063d61f4 · 2021-10-03T17:20:22.000-07:00
* Use "Beta" since this is what Apple uses too
* Actually copy the OTP if the option is set
* Shorten notification text to make it fit to smaller screens
* Set notification center delegate before app launches
* Fix SwiftFormat issue fixed with version 0.48.12
diff --git a/pass/AppDelegate.swift b/pass/AppDelegate.swift
@@ -34,6 +34,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 perform(#selector(postSearchNotification), with: nil, afterDelay: 0.4)
             }
         }
+        UNUserNotificationCenter.current().delegate = NotificationCenterDispatcher.shared
         return true
     }
 
diff --git a/pass/Controllers/PasswordNavigationViewController.swift b/pass/Controllers/PasswordNavigationViewController.swift
@@ -99,7 +99,6 @@ class PasswordNavigationViewController: UIViewController {
             options: []
         )
         notificationCenter.setNotificationCategories([otpCategory])
-        notificationCenter.delegate = NotificationCenterDispatcher.shared
     }
 
     override func viewWillAppear(_ animated: Bool) {
diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift
@@ -225,7 +225,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
     @objc
     func alertTextFieldDidChange(_ sender: UITextField) {
         // check whether we should enable the Save button in setPasscodeLockAlert
-        if let setPasscodeLockAlert = self.setPasscodeLockAlert,
+        if let setPasscodeLockAlert = setPasscodeLockAlert,
            let setPasscodeLockAlertTextFields0 = setPasscodeLockAlert.textFields?[0],
            let setPasscodeLockAlertTextFields1 = setPasscodeLockAlert.textFields?[1] {
             if sender == setPasscodeLockAlertTextFields0 || sender == setPasscodeLockAlertTextFields1 {
diff --git a/pass/de.lproj/Localizable.strings b/pass/de.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 "None"                      = "Kein valides Token";
 "ExpiresIn"                 = "(läuft in %ds ab)";
 "OTPForPassword"            = "Einmalpasswort für %@";
-"OTPForPasswordCopied"      = "Einmalpasswort für %@ kopiert";
+"OTPHasBeenCopied"          = "... wurde in die Zwischenablage kopiert";
 "CopyToPasteboard"          = "In Zwischenablage kopieren";
 "AutoCopyOTP"               = "OTPs automatisch kopieren";
-"AutoCopyOTPExplanation."   = "Nachdem Login und Passwort automatisch in die vorgesehenen Felder gefüllt wurden, wird eine Benachrichtigung mit dem aktuellen Einmalpasswort angezeigt. Dieses kann in die Zwischenablage kopiert werden. Ist diese Option aktiviert, geschieht das Kopieren automatisch.";
+"AutoCopyOTPExplanation."   = "Nachdem Login und Passwort automatisch in die vorgesehenen Felder eingefügt wurden, wird eine Benachrichtigung mit dem aktuellen Einmalpasswort angezeigt. Dieses kann in die Zwischenablage kopiert werden. Ist diese Option aktiviert, geschieht das Kopieren automatisch.";
 
 // General (error) messages
 "Error"                                             = "Fehler";
@@ -46,7 +46,7 @@
 "PasswordGeneratorFlavor"           = "Art";
 "RememberPgpKeyPassphrase"          = "GPG-Schlüssel-Passwort merken";
 "RememberGitCredentialPassphrase"   = "Git-Server-Passwort merken";
-"EnableGPGID"                       = "Berücksichtige .gpg-id Dateien (experimentell)";
+"EnableGPGID"                       = "Berücksichtige .gpg-id Dateien (Beta)";
 "ShowFolders"                       = "Ordner anzeigen";
 "HidePasswordImages"                = "Favicons verstecken";
 "HidePasswordImagesExplanation."    = "Favicons werden basierend auf der assoziierten URL geladen und in Passworteinträgen angezeigt. Aktiviere diese Option, um das Laden dieser Bilder zu unterbinden und sie nicht anzuzeigen.";
diff --git a/pass/en.lproj/Localizable.strings b/pass/en.lproj/Localizable.strings
@@ -23,7 +23,7 @@
 "None"                      = "None";
 "ExpiresIn"                 = "(expires in %ds)";
 "OTPForPassword"            = "One-time password for %@";
-"OTPForPasswordCopied"      = "One-time password for %@ copied";
+"OTPHasBeenCopied"          = "... has been copied to the pasteboard";
 "CopyToPasteboard"          = "Copy to pasteboard";
 "AutoCopyOTP"               = "Automatically Copy OTPs";
 "AutoCopyOTPExplanation."   = "After username and password have been auto-filled into a form by Pass, a notification is shown with the current one-time password which can be copied to the pasteboard. Enabling this option automatically copies the current one-time password.";
@@ -46,7 +46,7 @@
 "PasswordGeneratorFlavor"           = "Style";
 "RememberPgpKeyPassphrase"          = "Remember PGP Key Passphrase";
 "RememberGitCredentialPassphrase"   = "Remember Git Credential Passphrase";
-"EnableGPGID"                       = "Enable .gpg-id (Experiment)";
+"EnableGPGID"                       = "Enable .gpg-id (Beta)";
 "ShowFolders"                       = "Show Folders";
 "HidePasswordImages"                = "Hide Password Images";
 "HidePasswordImagesExplanation."    = "Associated favicon images are loaded and shown based upon the URL associated with an entry. Enable this option to hide these images and prevent them from being loaded.";
diff --git a/passKit/Helpers/NotificationCenterDispatcher.swift b/passKit/Helpers/NotificationCenterDispatcher.swift
@@ -28,10 +28,11 @@ public class NotificationCenterDispatcher: NSObject, UNUserNotificationCenterDel
                 return
             }
             let content = UNMutableNotificationContent()
+            content.title = "OTPForPassword".localize(password.name)
             if Defaults.autoCopyOTP {
-                content.title = "OTPForPasswordCopied".localize(password.name)
+                content.body = "OTPHasBeenCopied".localize()
+                UIPasteboard.general.string = otp
             } else {
-                content.title = "OTPForPassword".localize(password.name)
                 content.body = otp
                 content.categoryIdentifier = Globals.otpNotificationCategory
                 content.userInfo = [
diff --git a/passKit/Parser/Parser.swift b/passKit/Parser/Parser.swift
@@ -17,7 +17,7 @@ class Parser {
     init(plainText: String) {
         let splittedPlainText = plainText.splitByNewline()
 
-        firstLine = splittedPlainText.first!
+        self.firstLine = splittedPlainText.first!
         self.additionsSection = splittedPlainText[1...].joined(separator: "\n")
         self.purgedAdditionalLines = splittedPlainText[1...].filter { !$0.isEmpty }
     }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`34`	`34`	`perform(#selector(postSearchNotification), with: nil, afterDelay: 0.4)`
`35`	`35`	`}`
`36`	`36`	`}`
	`37`	`+ UNUserNotificationCenter.current().delegate = NotificationCenterDispatcher.shared`
`37`	`38`	`return true`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,6 @@ class PasswordNavigationViewController: UIViewController {`
`99`	`99`	`options: []`
`100`	`100`	`)`
`101`	`101`	`notificationCenter.setNotificationCategories([otpCategory])`
`102`		`- notificationCenter.delegate = NotificationCenterDispatcher.shared`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`override func viewWillAppear(_ animated: Bool) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class Parser {`
`17`	`17`	`init(plainText: String) {`
`18`	`18`	`let splittedPlainText = plainText.splitByNewline()`
`19`	`19`
`20`		`- firstLine = splittedPlainText.first!`
	`20`	`+ self.firstLine = splittedPlainText.first!`
`21`	`21`	`self.additionsSection = splittedPlainText[1...].joined(separator: "\n")`
`22`	`22`	`self.purgedAdditionalLines = splittedPlainText[1...].filter { !$0.isEmpty }`
`23`	`23`	`}`