@react-native-firebase/analytics 26.4.0 → 27.0.0

package/ios/RNFBAnalytics/RNFBAnalyticsModule.mm

@@ -15,88 +15,14 @@
  *
  */
 
-#if __has_include(<Firebase/Firebase.h>)
-#import <Firebase/Firebase.h>
-#elif __has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
-#import <FirebaseAnalytics/FirebaseAnalytics.h>
-#import <FirebaseCore/FirebaseCore.h>
-#else
-@import FirebaseCore;
-@import FirebaseAnalytics;
-#endif
-#import <React/RCTUtils.h>
-
-#if __has_include(<RNFBAnalytics/RNFBAnalytics-Swift.h>)
-// This import will work in situations where `use_frameworks!` is in use
-#import <RNFBAnalytics/RNFBAnalytics-Swift.h>
-#elif __has_include("RNFBAnalytics-Swift.h")
-// If `use_frameworks!` is not in use (for example, while using pre-built
-// react-native core) then header imports based on frameworks assumptions fail.
-// So, if frameworks are not available, fall back to importing the header directly, it
-// should be findable from a header search path pointing to the build
-// directory. See firebase-ios-sdk#12611 for more context.
-#import "RNFBAnalytics-Swift.h"
-#endif
-#import <RNFBApp/RNFBSharedUtils.h>
+// This module intentionally has no Firebase imports and no `*-Swift.h` —
+// see RNFBAnalyticsHelper.h. Every Firebase Analytics SDK call (and the
+// Swift param cleaner / consent mapper / log-transaction types) is routed
+// through the plain Objective-C RNFBAnalyticsHelper class instead, which
+// can safely `@import` FirebaseAnalytics / import the generated Swift
+// interface because it compiles as ObjC, not ObjC++.
 #import "RNFBAnalyticsModule.h"
-
-/** GA4 parameters that must be sent as integer NSNumber values (not doubles from JS). */
-static NSArray<NSString *> *RNFBAnalyticsLongNumericParameterKeys(void) {
-  static NSArray<NSString *> *keys;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    keys = @[
-      kFIRParameterQuantity,
-      kFIRParameterIndex,
-      kFIRParameterLevel,
-      kFIRParameterNumberOfNights,
-      kFIRParameterNumberOfPassengers,
-      kFIRParameterNumberOfRooms,
-      kFIRParameterScore,
-    ];
-  });
-  return keys;
-}
-
-static void RNFBAnalyticsAddConsentStatus(NSMutableDictionary *consent,
-                                          NSDictionary *consentSettings, NSString *key,
-                                          FIRConsentType type) {
-  NSNumber *value = consentSettings[key];
-  if (value != nil) {
-    consent[type] = value.boolValue ? FIRConsentStatusGranted : FIRConsentStatusDenied;
-  }
-}
-
-static int RNFBAnalyticsHexDigit(unichar character) {
-  if (character >= '0' && character <= '9') {
-    return character - '0';
-  }
-  if (character >= 'a' && character <= 'f') {
-    return character - 'a' + 10;
-  }
-  if (character >= 'A' && character <= 'F') {
-    return character - 'A' + 10;
-  }
-  return -1;
-}
-
-static NSData *RNFBAnalyticsDataFromSHA256HexString(NSString *hexString) {
-  if (hexString.length != 64) {
-    return nil;
-  }
-
-  unsigned char bytes[32];
-  for (NSUInteger i = 0; i < sizeof(bytes); i++) {
-    int high = RNFBAnalyticsHexDigit([hexString characterAtIndex:i * 2]);
-    int low = RNFBAnalyticsHexDigit([hexString characterAtIndex:i * 2 + 1]);
-    if (high < 0 || low < 0) {
-      return nil;
-    }
-    bytes[i] = (high << 4) | low;
-  }
-
-  return [NSData dataWithBytes:bytes length:sizeof(bytes)];
-}
+#import "RNFBAnalyticsHelper.h"
 
 @implementation RNFBAnalyticsModule
 #pragma mark -
@@ -120,277 +46,101 @@ RCT_EXPORT_MODULE(NativeRNFBTurboAnalytics)
           params:(NSDictionary *)params
          resolve:(RCTPromiseResolveBlock)resolve
           reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    [FIRAnalytics logEventWithName:name parameters:[self cleanJavascriptParams:params]];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper logEvent:name params:params resolve:resolve reject:reject];
 }
 
 - (void)setAnalyticsCollectionEnabled:(BOOL)enabled
                               resolve:(RCTPromiseResolveBlock)resolve
                                reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    [FIRAnalytics setAnalyticsCollectionEnabled:enabled];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper setAnalyticsCollectionEnabled:enabled resolve:resolve reject:reject];
 }
 
 - (void)setUserId:(NSString *)id
           resolve:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    [FIRAnalytics setUserID:[self convertNSNullToNil:id]];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper setUserId:id resolve:resolve reject:reject];
 }
 
 - (void)setUserProperty:(NSString *)name
                   value:(NSString *)value
                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    [FIRAnalytics setUserPropertyString:[self convertNSNullToNil:value] forName:name];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper setUserProperty:name value:value resolve:resolve reject:reject];
 }
 
 - (void)setUserProperties:(NSDictionary *)properties
                   resolve:(RCTPromiseResolveBlock)resolve
                    reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    [properties enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) {
-      [FIRAnalytics setUserPropertyString:[self convertNSNullToNil:value] forName:key];
-    }];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper setUserProperties:properties resolve:resolve reject:reject];
 }
 
 - (void)resetAnalyticsData:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    [FIRAnalytics resetAnalyticsData];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper resetAnalyticsData:resolve reject:reject];
 }
 
 - (void)setSessionTimeoutDuration:(double)milliseconds
                           resolve:(RCTPromiseResolveBlock)resolve
                            reject:(RCTPromiseRejectBlock)reject {
-  [FIRAnalytics setSessionTimeoutInterval:milliseconds / 1000];
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper setSessionTimeoutDuration:milliseconds resolve:resolve reject:reject];
 }
 
 - (void)getAppInstanceId:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
-  return resolve([FIRAnalytics appInstanceID]);
+  [RNFBAnalyticsHelper getAppInstanceId:resolve reject:reject];
 }
 
 - (void)getSessionId:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
-  __block BOOL completed = NO;
-  const int64_t timeoutNs = (int64_t)(60 * NSEC_PER_SEC);
-
-  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, timeoutNs), dispatch_get_main_queue(), ^{
-    if (completed) {
-      return;
-    }
-    completed = YES;
-    DLog(@"getSessionId timed_out: no SDK callback within 60 seconds");
-    resolve([NSNull null]);
-  });
-
-  [FIRAnalytics sessionIDWithCompletion:^(int64_t sessionID, NSError *_Nullable error) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (completed) {
-        return;
-      }
-      completed = YES;
-
-      // Occasionally sessionID is 0 despite nil error, reject as if it were an error
-      // https://github.com/firebase/firebase-ios-sdk/issues/15258
-      if (!error && [NSNumber numberWithLongLong:sessionID] == 0) {
-        DLog(@"getSessionId zero_without_error: sessionID=0 (firebase-ios-sdk#15258)");
-        return resolve([NSNull null]);
-      }
-
-      if (error) {
-        DLog(@"getSessionId sdk_error: domain=%@ code=%ld description=%@", error.domain,
-             (long)error.code, error.localizedDescription ?: @"(none)");
-        return resolve([NSNull null]);
-      }
-
-      DLog(@"getSessionId success: sessionID=%lld", sessionID);
-      return resolve([NSNumber numberWithLongLong:sessionID]);
-    });
-  }];
+  [RNFBAnalyticsHelper getSessionId:resolve reject:reject];
 }
 
 - (void)setDefaultEventParameters:(NSDictionary *)params
                           resolve:(RCTPromiseResolveBlock)resolve
                            reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    [FIRAnalytics setDefaultEventParameters:[self cleanJavascriptParams:params]];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper setDefaultEventParameters:params resolve:resolve reject:reject];
 }
 
 - (void)initiateOnDeviceConversionMeasurementWithEmailAddress:(NSString *)emailAddress
                                                       resolve:(RCTPromiseResolveBlock)resolve
                                                        reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    [FIRAnalytics initiateOnDeviceConversionMeasurementWithEmailAddress:emailAddress];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper initiateOnDeviceConversionMeasurementWithEmailAddress:emailAddress
+                                                                     resolve:resolve
+                                                                      reject:reject];
 }
 
 - (void)initiateOnDeviceConversionMeasurementWithHashedEmailAddress:(NSString *)hashedEmailAddress
                                                             resolve:(RCTPromiseResolveBlock)resolve
                                                              reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    NSData *emailAddress = RNFBAnalyticsDataFromSHA256HexString(hashedEmailAddress);
-    if (emailAddress == nil) {
-      reject(@"firebase_analytics", @"Expected a 64-character SHA-256 hex string", nil);
-      return;
-    }
-    [FIRAnalytics initiateOnDeviceConversionMeasurementWithHashedEmailAddress:emailAddress];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper
+      initiateOnDeviceConversionMeasurementWithHashedEmailAddress:hashedEmailAddress
+                                                          resolve:resolve
+                                                           reject:reject];
 }
 
 - (void)initiateOnDeviceConversionMeasurementWithPhoneNumber:(NSString *)phoneNumber
                                                      resolve:(RCTPromiseResolveBlock)resolve
                                                       reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    [FIRAnalytics initiateOnDeviceConversionMeasurementWithPhoneNumber:phoneNumber];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper initiateOnDeviceConversionMeasurementWithPhoneNumber:phoneNumber
+                                                                    resolve:resolve
+                                                                     reject:reject];
 }
 
 - (void)initiateOnDeviceConversionMeasurementWithHashedPhoneNumber:(NSString *)hashedPhoneNumber
                                                            resolve:(RCTPromiseResolveBlock)resolve
                                                             reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    NSData *phoneNumber = RNFBAnalyticsDataFromSHA256HexString(hashedPhoneNumber);
-    if (phoneNumber == nil) {
-      reject(@"firebase_analytics", @"Expected a 64-character SHA-256 hex string", nil);
-      return;
-    }
-    [FIRAnalytics initiateOnDeviceConversionMeasurementWithHashedPhoneNumber:phoneNumber];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-
-  return resolve([NSNull null]);
+  [RNFBAnalyticsHelper initiateOnDeviceConversionMeasurementWithHashedPhoneNumber:hashedPhoneNumber
+                                                                          resolve:resolve
+                                                                           reject:reject];
 }
 
 - (void)logTransaction:(NSString *)transactionId
                resolve:(RCTPromiseResolveBlock)resolve
                 reject:(RCTPromiseRejectBlock)reject {
-  if (@available(iOS 15.0, macOS 12.0, *)) {
-    RNFBAnalyticsLogTransaction *handler = [[RNFBAnalyticsLogTransaction alloc] init];
-    [handler logTransactionWithTransactionId:transactionId resolve:resolve reject:reject];
-  } else {
-    reject(@"firebase_analytics", @"logTransaction() is only supported on iOS 15.0 or newer", nil);
-  }
+  [RNFBAnalyticsHelper logTransaction:transactionId resolve:resolve reject:reject];
 }
 
 - (void)setConsent:(NSDictionary *)consentSettings
            resolve:(RCTPromiseResolveBlock)resolve
             reject:(RCTPromiseRejectBlock)reject {
-  @try {
-    NSMutableDictionary *consent = [NSMutableDictionary dictionaryWithCapacity:4];
-    RNFBAnalyticsAddConsentStatus(consent, consentSettings, @"analytics_storage",
-                                  FIRConsentTypeAnalyticsStorage);
-    RNFBAnalyticsAddConsentStatus(consent, consentSettings, @"ad_storage", FIRConsentTypeAdStorage);
-    RNFBAnalyticsAddConsentStatus(consent, consentSettings, @"ad_user_data",
-                                  FIRConsentTypeAdUserData);
-    RNFBAnalyticsAddConsentStatus(consent, consentSettings, @"ad_personalization",
-                                  FIRConsentTypeAdPersonalization);
-    [FIRAnalytics setConsent:consent];
-  } @catch (NSException *exception) {
-    return [RNFBSharedUtils rejectPromiseWithExceptionDict:reject exception:exception];
-  }
-  return resolve([NSNull null]);
-}
-
-#pragma mark -
-#pragma mark Private methods
-
-- (NSDictionary *)cleanJavascriptParams:(NSDictionary *)params {
-  NSMutableDictionary *newParams = [params mutableCopy];
-  if (newParams[kFIRParameterItems]) {
-    NSMutableArray *newItems = [NSMutableArray array];
-    [(NSArray *)newParams[kFIRParameterItems]
-        enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
-          NSMutableDictionary *item = [obj mutableCopy];
-          [self rnfb_coerceLongNumericParametersInMutableDictionary:item];
-          [newItems addObject:[item copy]];
-        }];
-    newParams[kFIRParameterItems] = [newItems copy];
-  }
-  [self rnfb_coerceLongNumericParametersInMutableDictionary:newParams];
-  [self rnfb_coerceSuccessParameterInMutableDictionary:newParams];
-  NSNumber *extendSession = [newParams valueForKey:kFIRParameterExtendSession];
-  if ([extendSession isEqualToNumber:@1]) {
-    newParams[kFIRParameterExtendSession] = @YES;
-  }
-  return [newParams copy];
-}
-
-- (void)rnfb_coerceLongNumericParametersInMutableDictionary:(NSMutableDictionary *)dict {
-  for (NSString *key in RNFBAnalyticsLongNumericParameterKeys()) {
-    id value = dict[key];
-    if (value != nil && value != [NSNull null]) {
-      dict[key] = @([value integerValue]);
-    }
-  }
-}
-
-- (void)rnfb_coerceSuccessParameterInMutableDictionary:(NSMutableDictionary *)dict {
-  id value = dict[kFIRParameterSuccess];
-  if (value == nil || value == [NSNull null]) {
-    return;
-  }
-  int success = 0;
-  if ([value isKindOfClass:[NSString class]]) {
-    NSString *lower = [(NSString *)value lowercaseString];
-    if ([lower isEqualToString:@"true"] || [lower isEqualToString:@"yes"] ||
-        [lower isEqualToString:@"1"]) {
-      success = 1;
-    }
-  } else {
-    success = [value boolValue] ? 1 : 0;
-  }
-  dict[kFIRParameterSuccess] = @(success);
-}
-
-/// Converts null values received over the bridge from NSNull to nil
-/// @param value Nullable string value
-- (NSString *)convertNSNullToNil:(NSString *)value {
-  return [value isEqual:[NSNull null]] ? nil : value;
+  [RNFBAnalyticsHelper setConsent:consentSettings resolve:resolve reject:reject];
 }
 
 @end

package/ios/RNFBAnalytics.xcodeproj/project.pbxproj

@@ -9,6 +9,9 @@
 /* Begin PBXBuildFile section */
 		2744B98621F45429004F8E3F /* RNFBAnalyticsModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2744B98521F45429004F8E3F /* RNFBAnalyticsModule.mm */; };
 		2744B99021F45429004F8E3F /* RNFBAnalyticsLogTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2744B98F21F45429004F8E3F /* RNFBAnalyticsLogTransaction.swift */; };
+		2744B99121F45429004F8E3F /* RNFBAnalyticsJavascriptParamsCleaner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2744B99221F45429004F8E3F /* RNFBAnalyticsJavascriptParamsCleaner.swift */; };
+		2744B99321F45429004F8E3F /* RNFBAnalyticsConsentSettingsMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2744B99421F45429004F8E3F /* RNFBAnalyticsConsentSettingsMapper.swift */; };
+		RNFBAN000000000000000006 /* RNFBAnalyticsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = RNFBAN000000000000000008 /* RNFBAnalyticsHelper.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -28,6 +31,10 @@
 		2744B98421F45429004F8E3F /* RNFBAnalyticsModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFBAnalyticsModule.h; path = RNFBAnalytics/RNFBAnalyticsModule.h; sourceTree = SOURCE_ROOT; };
 		2744B98521F45429004F8E3F /* RNFBAnalyticsModule.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = RNFBAnalyticsModule.mm; path = RNFBAnalytics/RNFBAnalyticsModule.mm; sourceTree = SOURCE_ROOT; };
 		2744B98F21F45429004F8E3F /* RNFBAnalyticsLogTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBAnalyticsLogTransaction.swift; path = RNFBAnalytics/RNFBAnalyticsLogTransaction.swift; sourceTree = SOURCE_ROOT; };
+		2744B99221F45429004F8E3F /* RNFBAnalyticsJavascriptParamsCleaner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBAnalyticsJavascriptParamsCleaner.swift; path = RNFBAnalytics/RNFBAnalyticsJavascriptParamsCleaner.swift; sourceTree = SOURCE_ROOT; };
+		2744B99421F45429004F8E3F /* RNFBAnalyticsConsentSettingsMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBAnalyticsConsentSettingsMapper.swift; path = RNFBAnalytics/RNFBAnalyticsConsentSettingsMapper.swift; sourceTree = SOURCE_ROOT; };
+		RNFBAN000000000000000007 /* RNFBAnalyticsHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFBAnalyticsHelper.h; path = RNFBAnalytics/RNFBAnalyticsHelper.h; sourceTree = SOURCE_ROOT; };
+		RNFBAN000000000000000008 /* RNFBAnalyticsHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFBAnalyticsHelper.m; path = RNFBAnalytics/RNFBAnalyticsHelper.m; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -56,7 +63,11 @@
 				2744B98C21F45C64004F8E3F /* common */,
 				2744B98421F45429004F8E3F /* RNFBAnalyticsModule.h */,
 				2744B98521F45429004F8E3F /* RNFBAnalyticsModule.mm */,
+				RNFBAN000000000000000007 /* RNFBAnalyticsHelper.h */,
+				RNFBAN000000000000000008 /* RNFBAnalyticsHelper.m */,
 				2744B98F21F45429004F8E3F /* RNFBAnalyticsLogTransaction.swift */,
+				2744B99221F45429004F8E3F /* RNFBAnalyticsJavascriptParamsCleaner.swift */,
+				2744B99421F45429004F8E3F /* RNFBAnalyticsConsentSettingsMapper.swift */,
 			);
 			path = RNFBAnalytics;
 			sourceTree = "<group>";
@@ -128,7 +139,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				2744B98621F45429004F8E3F /* RNFBAnalyticsModule.mm in Sources */,
+				RNFBAN000000000000000006 /* RNFBAnalyticsHelper.m in Sources */,
 				2744B99021F45429004F8E3F /* RNFBAnalyticsLogTransaction.swift in Sources */,
+				2744B99121F45429004F8E3F /* RNFBAnalyticsJavascriptParamsCleaner.swift in Sources */,
+				2744B99321F45429004F8E3F /* RNFBAnalyticsConsentSettingsMapper.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -170,7 +184,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.10;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -205,7 +219,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.10;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};