Fixes #1545: Set SiriShortcuts correctly (#1584)

mozilla-mobile · Nov 21, 2018 · 9c24468 · 9c24468
1 parent a306479
commit 9c24468
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Blockzilla/SettingsViewController.swift b/Blockzilla/SettingsViewController.swift
@@ -510,11 +510,11 @@ class SettingsViewController: UIViewController, UITableViewDataSource, UITableVi
                     siriCell.accessoryLabel.text = result ? UIConstants.strings.Edit : UIConstants.strings.addToSiri
                 }
             } else if indexPath.row == 1 {
-                    siriCell.labelText = UIConstants.strings.eraseAndOpenSiri
-                    siriCell.accessibilityIdentifier = "settingsViewController.siriEraseAndOpenCell"
-                    SiriShortcuts().hasAddedActivity(type: .eraseAndOpen) { (result: Bool) in
-                        siriCell.accessoryLabel.text = result ? UIConstants.strings.Edit : UIConstants.strings.addToSiri
-                    }
+                siriCell.labelText = UIConstants.strings.eraseAndOpenSiri
+                siriCell.accessibilityIdentifier = "settingsViewController.siriEraseAndOpenCell"
+                SiriShortcuts().hasAddedActivity(type: .eraseAndOpen) { (result: Bool) in
+                    siriCell.accessoryLabel.text = result ? UIConstants.strings.Edit : UIConstants.strings.addToSiri
+                }
             } else {
                 siriCell.labelText = UIConstants.strings.openUrlSiri
                 siriCell.accessibilityIdentifier = "settingsViewController.siriOpenURLCell"

diff --git a/Blockzilla/SiriShortcuts.swift b/Blockzilla/SiriShortcuts.swift
@@ -68,7 +68,7 @@ class SiriShortcuts {
                     attempt.shortcut.userActivity?.activityType == type.rawValue
                     }.first
                 // Next, check for intent, which is used for shortcuts that work in the background
-                if foundShortcut == nil {
+                if type == SiriShortcuts.activityType.erase && foundShortcut == nil {
                     foundShortcut = voiceShortcuts.filter { (attempt) in
                         attempt.shortcut.intent as? EraseIntent != nil
                         }.first
@@ -107,7 +107,7 @@ class SiriShortcuts {
                 var foundShortcut = voiceShortcuts.filter { (attempt) in
                     attempt.shortcut.userActivity?.activityType == activityType.rawValue
                     }.first
-                if foundShortcut == nil {
+                if activityType == SiriShortcuts.activityType.erase && foundShortcut == nil {
                     foundShortcut = voiceShortcuts.filter { (attempt) in
                         attempt.shortcut.intent as? EraseIntent != nil
                         }.first