Merge pull request #8223 from hansemannn/TIMOB-23747-5_5_X

[TIMOB-23747] (5_5_X) iOS: Fix UserActivity iOS9-API, cleanup
tidev · Aug 14, 2016 · af82f64 · af82f64
2 parents e67f3ea + 1630e9a
commit af82f64
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/iphone/Classes/TiApp.m b/iphone/Classes/TiApp.m
@@ -993,25 +993,23 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct
  restorationHandler:(void (^)(NSArray *restorableObjects))restorationHandler
 {
 
-    NSMutableDictionary *dict = [NSMutableDictionary
-                                 dictionaryWithObjectsAndKeys:[userActivity activityType],@"activityType",
-                                 nil];
+    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:@{@"activityType": [userActivity activityType]}];
 
-    if( [userActivity.activityType isEqualToString:CSSearchableItemActionType]){
-        if([userActivity userInfo] !=nil){
+    if ([TiUtils isIOS9OrGreater] && [[userActivity activityType] isEqualToString:CSSearchableItemActionType]) {
+        if ([userActivity userInfo] != nil) {
             [dict setObject:[[userActivity userInfo] objectForKey:CSSearchableItemActivityIdentifier] forKey:@"searchableItemActivityIdentifier"];
         }
     }
 
-    if([userActivity title] !=nil){
+    if ([userActivity title] != nil) {
         [dict setObject:[userActivity title] forKey:@"title"];
     }
 
-    if([userActivity webpageURL] !=nil){
+    if ([userActivity webpageURL] != nil) {
         [dict setObject:[[userActivity webpageURL] absoluteString] forKey:@"webpageURL"];
     }
 
-    if([userActivity userInfo] !=nil){
+    if ([userActivity userInfo] != nil) {
         [dict setObject:[userActivity userInfo] forKey:@"userInfo"];
     }
 
@@ -1020,10 +1018,9 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct
 	[userActivityDict setObject:dict forKey:@"UIApplicationLaunchOptionsUserActivityKey"];
 	[launchOptions setObject:userActivityDict forKey:UIApplicationLaunchOptionsUserActivityDictionaryKey];
 
-    if (appBooted){
+    if (appBooted) {
         [[NSNotificationCenter defaultCenter] postNotificationName:kTiContinueActivity object:self userInfo:dict];
-    }
-    else{
+    } else {
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             [[NSNotificationCenter defaultCenter] postNotificationName:kTiContinueActivity object:self userInfo:dict];
         });