Merge branch 'master' into TIMOB-24549

tidev · Dec 8, 2020 · f3ef6f8 · f3ef6f8
2 parents f8ad156 + e6a8710
commit f3ef6f8
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 73 deletions.
diff --git a/android/titanium/lib/aps-analytics.jar b/android/titanium/lib/aps-analytics.jar
diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiApplication.java b/android/titanium/src/java/org/appcelerator/titanium/TiApplication.java
@@ -380,6 +380,12 @@ public void onDisposing(KrollRuntime runtime)
 
 				// Delete all Titanium temp files.
 				deleteTiTempFiles();
+
+				if (isAnalyticsEnabled()) {
+
+					// Force send `session.end` event.
+					APSAnalytics.getInstance().sendSessionEndEvent(true);
+				}
 			}
 		});
 	}

diff --git a/iphone/Classes/GeolocationModule.m b/iphone/Classes/GeolocationModule.m
@@ -507,6 +507,7 @@ - (void)performGeo:(NSString *)direction address:(NSString *)address callback:(G
     [params setValue:countryCode forKey:@"c"];
   }
   [callback start:params];
+  RELEASE_TO_NIL(params);
 }
 
 - (JSValue *)reverseGeocoder:(double)latitude longitude:(double)longitude withCallback:(JSValue *)callback

diff --git a/iphone/Classes/MediaModule.m b/iphone/Classes/MediaModule.m
@@ -1791,6 +1791,8 @@ - (void)showPHPicker:(NSDictionary *)args
 
   [_phPicker setDelegate:self];
   [self displayModalPicker:_phPicker settings:args];
+
+  RELEASE_TO_NIL(configuration);
 }
 
 #pragma mark PHPickerViewControllerDelegate

diff --git a/iphone/Classes/TiAppiOSProxy.m b/iphone/Classes/TiAppiOSProxy.m
@@ -500,6 +500,7 @@ - (void)registerUserNotificationSettings:(id)args
                                                                               // Assign the granted categories
                                                                               [event setValue:((categories != nil) ? categories : @{}) forKey:@"categories"];
                                                                               [self fireEvent:@"usernotificationsettings" withObject:event];
+                                                                              RELEASE_TO_NIL(event);
                                                                             }];
                                                                           }
                                                                         }
@@ -846,6 +847,10 @@ - (void)assignUserInfo:(NSDictionary *)userInfo toContent:(id)content ensureIden
   } else if ([content isKindOfClass:UILocalNotification.class]) {
     ((UILocalNotification *)content).userInfo = userInfoWithId;
   }
+
+  if (userInfo != nil) {
+    RELEASE_TO_NIL(userInfoWithId);
+  }
 }
 
 - (void)cancelAllLocalNotifications:(id)unused

diff --git a/iphone/Classes/TiAppiOSUserNotificationCenterProxy.m b/iphone/Classes/TiAppiOSUserNotificationCenterProxy.m
@@ -85,6 +85,7 @@ - (void)removePendingNotifications:(id)args
     if (identifiers.count > 0) {
       [center removePendingNotificationRequestsWithIdentifiers:identifiers];
     }
+    RELEASE_TO_NIL(identifiers);
   }];
 }
 
@@ -113,6 +114,7 @@ - (void)removeDeliveredNotifications:(id)args
     if (identifiers.count > 0) {
       [center removeDeliveredNotificationsWithIdentifiers:identifiers];
     }
+    RELEASE_TO_NIL(identifiers);
   }];
 }
 

diff --git a/iphone/Classes/TiDOMNodeProxy.m b/iphone/Classes/TiDOMNodeProxy.m
@@ -24,15 +24,15 @@
 #import "TiDOMValidator.h"
 #import <TitaniumKit/TiUtils.h>
 #include <libkern/OSAtomic.h>
-
+#import <os/lock.h>
 /*
  * The nodeRegistry is used to map xmlNodePtr objects to TiDOMNodeProxies
  * Ensures that there is only one active proxy for a give xmlNodePtr.
  * Values are inserted when the proxies are created
  * Values are removed when the proxies are freed
  */
 static CFMutableDictionaryRef nodeRegistry = NULL;
-OSSpinLock nodeRegistryLock = OS_SPINLOCK_INIT;
+os_unfair_lock nodeRegistryLock = OS_UNFAIR_LOCK_INIT;
 
 @implementation TiDOMNodeProxy
 @synthesize document, node;
@@ -62,11 +62,11 @@ - (NSString *)XMLString
 + (id)nodeForXMLNode:(xmlNodePtr)nodePtr
 {
   id result = nil;
-  OSSpinLockLock(&nodeRegistryLock);
+  os_unfair_lock_lock(&nodeRegistryLock);
   if (nodeRegistry != NULL) {
     result = CFDictionaryGetValue(nodeRegistry, nodePtr);
   }
-  OSSpinLockUnlock(&nodeRegistryLock);
+  os_unfair_lock_unlock(&nodeRegistryLock);
   return result;
 }
 
@@ -85,7 +85,7 @@ + (void)setNode:(id)node forXMLNode:(xmlNodePtr)nodePtr
   if ((node == nil) || (nodePtr == NULL)) {
     return;
   }
-  OSSpinLockLock(&nodeRegistryLock);
+  os_unfair_lock_lock(&nodeRegistryLock);
   if (nodeRegistry == NULL) {
     CFDictionaryKeyCallBacks keyCallbacks = kCFTypeDictionaryKeyCallBacks;
     CFDictionaryValueCallBacks callbacks = kCFTypeDictionaryValueCallBacks;
@@ -98,16 +98,16 @@ + (void)setNode:(id)node forXMLNode:(xmlNodePtr)nodePtr
     nodeRegistry = CFDictionaryCreateMutable(nil, 0, &keyCallbacks, &callbacks);
   }
   CFDictionarySetValue(nodeRegistry, (void *)nodePtr, node);
-  OSSpinLockUnlock(&nodeRegistryLock);
+  os_unfair_lock_unlock(&nodeRegistryLock);
 }
 
 + (void)removeNodeForXMLNode:(xmlNodePtr)nodePtr
 {
-  OSSpinLockLock(&nodeRegistryLock);
+  os_unfair_lock_lock(&nodeRegistryLock);
   if (nodeRegistry == NULL)
     return;
   CFDictionaryRemoveValue(nodeRegistry, nodePtr);
-  OSSpinLockUnlock(&nodeRegistryLock);
+  os_unfair_lock_unlock(&nodeRegistryLock);
 }
 
 - (id)makeNodeListProxyFromArray:(NSArray *)nodes context:(id<TiEvaluator>)context

diff --git a/iphone/Classes/TiUIListView.m b/iphone/Classes/TiUIListView.m
@@ -1177,6 +1177,9 @@ - (void)tableViewDidEndMultipleSelectionInteraction:(UITableView *)tableView
         [startingItem setDictionary:eventObject];
       }
       [selectedItems addObject:eventObject];
+
+      RELEASE_TO_NIL(eventObject);
+      RELEASE_TO_NIL(theSection);
     }
     [self.proxy fireEvent:@"itemsselected" withObject:@{ @"selectedItems" : selectedItems, @"startingItem" : startingItem }];
   }

diff --git a/iphone/Classes/TiUIShortcutProxy.h b/iphone/Classes/TiUIShortcutProxy.h
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 READONLY_PROPERTY(NSArray<TiUIShortcutItemProxy *> *, items, Items);
 READONLY_PROPERTY(NSArray<TiUIShortcutItemProxy *> *, staticItems, StaticItems);
 
-- (TiUIShortcutItemProxy *)getById:(NSString *)identifier;
+- (TiUIShortcutItemProxy *_Nullable)getById:(NSString *)identifier;
 
 - (void)remove:(TiUIShortcutItemProxy *)shortcut;
 

diff --git a/iphone/Classes/TiUIShortcutProxy.m b/iphone/Classes/TiUIShortcutProxy.m
@@ -120,6 +120,7 @@ - (void)remove:(TiUIShortcutItemProxy *)shortcut
       }
     }
     UIApplication.sharedApplication.shortcutItems = shortcutsCopy;
+    RELEASE_TO_NIL(shortcutsCopy);
   }
 }
 

diff --git a/iphone/Classes/TiUITabGroup.m b/iphone/Classes/TiUITabGroup.m
@@ -619,7 +619,7 @@ - (NSDictionary *)focusEvent
     index = [tabArray indexOfObject:[(TiUITabProxy *)focusedTabProxy controller]];
   }
   return @{
-    @"tab" : focusedTabProxy,
+    @"tab" : NULL_IF_NIL(focusedTabProxy),
     @"index" : NUMINTEGER(index),
     @"previousIndex" : NUMINT(-1),
     @"previousTab" : [NSNull null]

diff --git a/iphone/Classes/TiUITableView.m b/iphone/Classes/TiUITableView.m
@@ -2403,6 +2403,7 @@ - (void)viewGetFocus
     if (!controller.navigationItem.searchController) {
       controller.navigationItem.searchController = searchController;
     }
+    RELEASE_TO_NIL(controller);
   }
   if (!hideOnSearch && isSearched && self.searchedString && ![searchController isActive]) {
     isSearched = NO;

diff --git a/iphone/Classes/TiUIiOSPreviewContextProxy.m b/iphone/Classes/TiUIiOSPreviewContextProxy.m
@@ -54,7 +54,6 @@ - (void)dealloc
 
 - (void)connectToDelegate
 {
-#ifndef __clang_analyzer__
   UIView *nativeSourceView = nil;
 
 #ifdef USE_TI_UILISTVIEW
@@ -79,9 +78,12 @@ - (void)connectToDelegate
     nativeSourceView = [_sourceView view];
   }
   UIViewController *controller = [[[TiApp app] controller] topPresentedController];
-  [controller registerForPreviewingWithDelegate:[[TiPreviewingDelegate alloc] initWithPreviewContext:self]
+  TiPreviewingDelegate *previewingDelegate = [[TiPreviewingDelegate alloc] initWithPreviewContext:self];
+
+  [controller registerForPreviewingWithDelegate:previewingDelegate
                                      sourceView:nativeSourceView];
-#endif
+
+  RELEASE_TO_NIL(previewingDelegate);
 }
 
 @end

diff --git a/iphone/Classes/TiUIiOSProxy.m b/iphone/Classes/TiUIiOSProxy.m
@@ -470,7 +470,7 @@ - (TiBlob *)systemImage:(id)arg
     return nil;
   }
   ENSURE_SINGLE_ARG_OR_NIL(arg, NSString);
-  TiBlob *blob = [[TiBlob alloc] initWithSystemImage:arg];
+  TiBlob *blob = [[[TiBlob alloc] initWithSystemImage:arg] autorelease];
   return blob;
 }
 #endif
@@ -912,9 +912,9 @@ - (TiColor *)fetchSemanticColor:(id)color
   DEPRECATED_REPLACED(@"UI.iOS.fetchSemanticColor", @"9.1.0", @"UI.fetchSemanticColor");
 
   if ([TiUtils isIOSVersionOrGreater:@"11.0"]) {
-    return [[TiColor alloc] initWithColor:[UIColor colorNamed:color] name:nil];
+    return [[[TiColor alloc] initWithColor:[UIColor colorNamed:color] name:nil] autorelease];
   }
-  return [[TiColor alloc] initWithColor:UIColor.blackColor name:@"black"];
+  return [[[TiColor alloc] initWithColor:UIColor.blackColor name:@"black"] autorelease];
 }
 
 @end

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/KrollBridge.h b/iphone/TitaniumKit/TitaniumKit/Sources/API/KrollBridge.h
@@ -11,6 +11,7 @@
 #import "TiEvaluator.h"
 #import "TiModule.h"
 #import "TiProxy.h"
+#import <os/lock.h>
 
 @import Foundation;
 @import JavaScriptCore;
@@ -34,7 +35,7 @@ extern NSString *TitaniumModuleRequireFormat;
   //CFMutableDictionaryRefs only retain keys, which lets them work with proxies properly.
   CFMutableDictionaryRef registeredProxies;
   NSCondition *shutdownCondition;
-  OSSpinLock proxyLock;
+  os_unfair_lock proxyLock;
 }
 - (void)boot:(id)callback url:(NSURL *)url_ preload:(NSDictionary *)preload_;
 - (void)evalJSWithoutResult:(NSString *)code;