fix: update APSAnalytics (#12681)

Fixes TIMOB-28403

android/app/src/main/java/com/titanium/test/TitaniumTestApplication.java

@@ -18,15 +18,18 @@ public final class TitaniumTestApplication extends TiApplication
 	@Override
 	public void onCreate()
 	{
-		super.onCreate();
+		appInfo = new TitaniumTestAppInfo(this);
+
+		// KrollAssetHelper.setAssetCrypt(new AssetCryptImpl());
 
 		// Load cache as soon as possible.
 		KrollAssetCache.init(this);
 
-		appInfo = new TitaniumTestAppInfo(this);
+		super.onCreate();
 
 		V8Runtime runtime = new V8Runtime();
 		KrollRuntime.init(this, runtime);
+		postAppInfo();
 		postOnCreate();
 	}
 }

android/templates/build/App.java

@@ -41,7 +41,6 @@ public void onCreate()
 		KrollAssetCache.init(this);
 
 		super.onCreate();
-		postAppInfo();
 
 		V8Runtime runtime = new V8Runtime();
 
@@ -83,7 +82,7 @@ public void onCreate()
 <% }); %>
 
 		KrollRuntime.init(this, runtime);
-
+		postAppInfo();
 		postOnCreate();
 
 <% if (customModules.length) { %>

android/titanium/src/java/org/appcelerator/titanium/TiApplication.java

@@ -438,6 +438,11 @@ public void postAppInfo()
 
 		if (isAnalyticsEnabled()) {
 			APSAnalytics.getInstance().initialize(getAppGUID(), this);
+
+			final int cacheSize = this.appProperties.getInt("ti.analytics.cacheSize", -1);
+			if (cacheSize > -1) {
+				APSAnalytics.getInstance().setCacheSize(cacheSize);
+			}
 		} else {
 			Log.i(TAG, "Analytics have been disabled");
 		}

iphone/TitaniumKit/TitaniumKit/Libraries/APSAnalytics/APSAnalytics.h

@@ -22,6 +22,11 @@ extern NSString *_Nonnull const APSDeployTypeProduction;
  */
 @interface APSAnalytics : NSObject
 
+/**
+ * Determine if EOL has passed. (March 1st 2022 GMT-8)
+ */
++ (BOOL)IS_EOL;
+
 /**
  * Return the singleton instance to the real-time analytics service.
  */
@@ -67,6 +72,20 @@ extern NSString *_Nonnull const APSDeployTypeProduction;
  */
 - (void)setOptedOut:(BOOL)optedOut;
 
+/**
+ * Obtains number of events that will be cached.
+ *
+ * @return {NSInteger} number of events to cache
+ */
+- (NSInteger)getCacheSize;
+
+/**
+ * Writes the cache size property in the SharedPreferences instance.
+ *
+ * @param {NSInteger} number of events to cache
+ */
+- (void)setCacheSize:(NSInteger)cacheSize;
+
 /**
  * Sends an application enroll event to indicate first launch.
  *

iphone/TitaniumKit/TitaniumKit/Libraries/APSAnalytics/APSAnalytics.xcframework/Info.plist

@@ -8,18 +8,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libAPSAnalytics.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>HeadersPath</key>
@@ -42,15 +39,18 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>libAPSAnalytics.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>maccatalyst</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

iphone/TitaniumKit/TitaniumKit/Libraries/APSAnalytics/APSAnalytics.xcframework/ios-arm64/Headers/APSAnalytics.h

@@ -22,6 +22,11 @@ extern NSString *_Nonnull const APSDeployTypeProduction;
  */
 @interface APSAnalytics : NSObject
 
+/**
+ * Determine if EOL has passed. (March 1st 2022 GMT-8)
+ */
++ (BOOL)IS_EOL;
+
 /**
  * Return the singleton instance to the real-time analytics service.
  */
@@ -67,6 +72,20 @@ extern NSString *_Nonnull const APSDeployTypeProduction;
  */
 - (void)setOptedOut:(BOOL)optedOut;
 
+/**
+ * Obtains number of events that will be cached.
+ *
+ * @return {NSInteger} number of events to cache
+ */
+- (NSInteger)getCacheSize;
+
+/**
+ * Writes the cache size property in the SharedPreferences instance.
+ *
+ * @param {NSInteger} number of events to cache
+ */
+- (void)setCacheSize:(NSInteger)cacheSize;
+
 /**
  * Sends an application enroll event to indicate first launch.
  *

iphone/TitaniumKit/TitaniumKit/Libraries/APSAnalytics/APSAnalytics.xcframework/ios-arm64_x86_64-maccatalyst/Headers/APSAnalytics.h

@@ -22,6 +22,11 @@ extern NSString *_Nonnull const APSDeployTypeProduction;
  */
 @interface APSAnalytics : NSObject
 
+/**
+ * Determine if EOL has passed. (March 1st 2022 GMT-8)
+ */
++ (BOOL)IS_EOL;
+
 /**
  * Return the singleton instance to the real-time analytics service.
  */
@@ -67,6 +72,20 @@ extern NSString *_Nonnull const APSDeployTypeProduction;
  */
 - (void)setOptedOut:(BOOL)optedOut;
 
+/**
+ * Obtains number of events that will be cached.
+ *
+ * @return {NSInteger} number of events to cache
+ */
+- (NSInteger)getCacheSize;
+
+/**
+ * Writes the cache size property in the SharedPreferences instance.
+ *
+ * @param {NSInteger} number of events to cache
+ */
+- (void)setCacheSize:(NSInteger)cacheSize;
+
 /**
  * Sends an application enroll event to indicate first launch.
  *

iphone/TitaniumKit/TitaniumKit/Libraries/APSAnalytics/APSAnalytics.xcframework/ios-arm64_x86_64-simulator/Headers/APSAnalytics.h

@@ -22,6 +22,11 @@ extern NSString *_Nonnull const APSDeployTypeProduction;
  */
 @interface APSAnalytics : NSObject
 
+/**
+ * Determine if EOL has passed. (March 1st 2022 GMT-8)
+ */
++ (BOOL)IS_EOL;
+
 /**
  * Return the singleton instance to the real-time analytics service.
  */
@@ -67,6 +72,20 @@ extern NSString *_Nonnull const APSDeployTypeProduction;
  */
 - (void)setOptedOut:(BOOL)optedOut;
 
+/**
+ * Obtains number of events that will be cached.
+ *
+ * @return {NSInteger} number of events to cache
+ */
+- (NSInteger)getCacheSize;
+
+/**
+ * Writes the cache size property in the SharedPreferences instance.
+ *
+ * @param {NSInteger} number of events to cache
+ */
+- (void)setCacheSize:(NSInteger)cacheSize;
+
 /**
  * Sends an application enroll event to indicate first launch.
  *

iphone/TitaniumKit/TitaniumKit/Sources/API/KrollBridge.m

@@ -395,6 +395,15 @@ - (void)didStartNewContext:(KrollContext *)kroll
     NSString *deployType = TiSharedConfig.defaultConfig.applicationDeployType;
     NSString *guid = TiSharedConfig.defaultConfig.applicationGUID;
     [sharedAnalytics enableWithAppKey:guid andDeployType:deployType];
+
+    // Set analytics event cache size.
+    id cacheSizeObj = [[TiApp tiAppProperties] objectForKey:@"ti.analytics.cacheSize"];
+    if ([cacheSizeObj isKindOfClass:[NSNumber class]]) {
+      int cacheSize = [cacheSizeObj intValue];
+      if (cacheSize > -1) {
+        [sharedAnalytics setCacheSize:cacheSize];
+      }
+    }
   }
 
   NSURL *startURL = nil;