[TIMOB-26655] fix(ios): fix application shortcuts parity (#10539)

* fix(ios): properly remove dynamic shortcuts * fix(ios): use itemtype for shortcuts
tidev · Jan 23, 2019 · bd46b84 · bd46b84
1 parent 7589752
commit bd46b84
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/iphone/Classes/TiAppiOSProxy.m b/iphone/Classes/TiAppiOSProxy.m
@@ -187,11 +187,7 @@ - (void)didReceiveApplicationShortcutNotification:(NSNotification *)info
 {
   NSMutableDictionary *event = [[NSMutableDictionary alloc] initWithDictionary:@{
     @"title" : [[info userInfo] valueForKey:@"title"],
-#ifdef USE_TI_UIAPPLICATIONSHORTCUTS
-    @"identifier" : [[info userInfo] valueForKey:@"type"]
-#else
     @"itemtype" : [[info userInfo] valueForKey:@"type"]
-#endif
   }];
 
   if ([[info userInfo] valueForKey:@"subtitle"] != nil) {

diff --git a/iphone/Classes/TiUIApplicationShortcutsProxy.m b/iphone/Classes/TiUIApplicationShortcutsProxy.m
@@ -1,6 +1,6 @@
 /**
  * Appcelerator Titanium Mobile
- * Copyright (c) 2018 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2018-present by Appcelerator, Inc. All Rights Reserved.
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
@@ -142,13 +142,15 @@ - (void)removeDynamicShortcut:(id)identifier
   }
 
   NSMutableArray *shortcuts = (NSMutableArray *)[UIApplication sharedApplication].shortcutItems;
+  NSMutableIndexSet *shortcutsIndicesToDelete = [[NSMutableIndexSet alloc] init];
 
-  for (UIApplicationShortcutItem *item in shortcuts) {
-    if ([item.type isEqualToString:key]) {
-      [shortcuts removeObject:item];
+  [shortcuts enumerateObjectsUsingBlock:^(UIApplicationShortcutItem *_Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
+    if ([obj.type isEqualToString:key]) {
+      [shortcutsIndicesToDelete addIndex:idx];
     }
-  }
+  }];
 
+  [shortcuts removeObjectsAtIndexes:shortcutsIndicesToDelete];
   [UIApplication sharedApplication].shortcutItems = shortcuts;
 }
 

diff --git a/iphone/Classes/TiUIiOSApplicationShortcutsProxy.m b/iphone/Classes/TiUIiOSApplicationShortcutsProxy.m
@@ -1,6 +1,6 @@
 /**
  * Appcelerator Titanium Mobile
- * Copyright (c) 2015-2018 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2015-present by Appcelerator, Inc. All Rights Reserved.
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
@@ -142,13 +142,15 @@ - (void)removeDynamicShortcut:(id)itemtype
   }
 
   NSMutableArray *shortcuts = (NSMutableArray *)[UIApplication sharedApplication].shortcutItems;
+  NSMutableIndexSet *shortcutsIndicesToDelete = [[NSMutableIndexSet alloc] init];
 
-  for (UIApplicationShortcutItem *item in shortcuts) {
-    if ([item.type isEqualToString:key]) {
-      [shortcuts removeObject:item];
+  [shortcuts enumerateObjectsUsingBlock:^(UIApplicationShortcutItem *_Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
+    if ([obj.type isEqualToString:key]) {
+      [shortcutsIndicesToDelete addIndex:idx];
     }
-  }
+  }];
 
+  [shortcuts removeObjectsAtIndexes:shortcutsIndicesToDelete];
   [UIApplication sharedApplication].shortcutItems = shortcuts;
 }