Merge pull request #84 from Astrovic/master

feat(ios/android): update the Firebase iOS SDK to 10.25.0 and Android SDK to 22.0.0

Author: hansemannn

README.md

@@ -116,6 +116,15 @@ Make sure to check the [Log Events](https://firebase.google.com/docs/analytics/a
     - `value` (String)
     - `name` (String)
 
+Set up [consent mode](https://developers.google.com/tag-platform/security/guides/app-consent?consentmode=advanced) for apps
+
+##### `setConsent(parameters)`
+  - `parameters` (Dictionary)
+    - `analyticsStorage` (Boolean)
+    - `adStorage` (Boolean)
+    - `adUserData` (Boolean)
+    - `adPersonalization` (Boolean)
+
 Sets a user property to a given value. Up to 25 user property names are supported. Once set, user
 property values persist throughout the app lifecycle and across sessions.
 
@@ -166,11 +175,19 @@ Ti.API.info('App Instance ID: ' + FirebaseAnalytics.appInstanceID);
 FirebaseAnalytics.log('My_Event', { /* Optional arguments */ });
 
 // Set user-property string
-FirebaseAnalytics.setUserPropertyString({
-  name: 'My_Name',
+FirebaseAnalytics.saveUserProperty({
+  name: 'My Name',
   value: 'My Value'
 });
 
+// Set consents
+FirebaseAnalytics.setConsent({
+  analyticsStorage: true,
+  adStorage: true,
+  adUserData: true,
+  adPersonalization: true
+});
+
 // Set User-ID
 FirebaseAnalytics.userID = 'MyUserID';
 

android/build.gradle

@@ -3,6 +3,6 @@ repositories {
 }
 
 dependencies {
-	implementation 'com.google.firebase:firebase-analytics:22.2.0'
+	implementation 'com.google.firebase:firebase-analytics:22.4.0'
 	implementation 'com.google.firebase:firebase-installations:18.0.0'
 }

android/java-sources.txt

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.3.0
+version: 5.4.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: titanium-firebase-analytics

android/manifest

@@ -11,9 +11,12 @@
 import android.os.Bundle;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
+import com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus;
+import com.google.firebase.analytics.FirebaseAnalytics.ConsentType;
 import com.google.firebase.installations.FirebaseInstallations;
 
 import java.io.IOException;
+import java.util.EnumMap;
 import java.util.Map;
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollFunction;
@@ -61,6 +64,26 @@ public void setEnabled(Boolean enabled)
 		this.analyticsInstance().setAnalyticsCollectionEnabled(enabled);
 	}
 
+    private ConsentStatus toConsentStatus(boolean granted) {
+        return granted ? ConsentStatus.GRANTED : ConsentStatus.DENIED;
+    }
+
+    @Kroll.method
+    public void setConsent(KrollDict opts) {
+        boolean analyticsStorage = TiConvert.toBoolean(opts, "analyticsStorage", false);
+        boolean adStorage = TiConvert.toBoolean(opts, "adStorage", false);
+        boolean adUserData = TiConvert.toBoolean(opts, "adUserData", false);
+        boolean adPersonalization = TiConvert.toBoolean(opts, "adPersonalization", false);
+
+        Map<ConsentType, ConsentStatus> consentMap = new EnumMap<>(ConsentType.class);
+        consentMap.put(ConsentType.ANALYTICS_STORAGE, toConsentStatus(analyticsStorage));
+        consentMap.put(ConsentType.AD_STORAGE, toConsentStatus(adStorage));
+        consentMap.put(ConsentType.AD_USER_DATA, toConsentStatus(adUserData));
+        consentMap.put(ConsentType.AD_PERSONALIZATION, toConsentStatus(adPersonalization));
+
+        this.analyticsInstance().setConsent(consentMap);
+    }
+
 	@Kroll.method
 	@Kroll.setProperty
 	public void setUserPropertyString(KrollDict parameters)
@@ -171,4 +194,4 @@ private Bundle mapToBundle(Map<String, Object> map)
 
 		return bundle;
 	}
-}
+}

android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:module xmlns:ti="http://ti.appcelerator.org" xmlns:android="http://schemas.android.com/apk/res/android">
+	<android xmlns:android="http://schemas.android.com/apk/res/android">
+        <manifest>
+            <application>
+                <meta-data android:name="google_analytics_default_allow_analytics_storage" android:value="true" />
+				<meta-data android:name="google_analytics_default_allow_ad_storage" android:value="true" />
+				<meta-data android:name="google_analytics_default_allow_ad_user_data" android:value="true" />
+				<meta-data android:name="google_analytics_default_allow_ad_personalization_signals" android:value="true" />
+            </application>
+        </manifest>
+    </android>
 	<modules>
 		<!-- Require Ti.PlayServices (https://github.com/appcelerator-modules/ti.playservices) -->
 		<module platform="android">ti.playservices</module>

android/timodule.xml

@@ -11,11 +11,19 @@ Ti.API.info('App Instance ID: ' + FirebaseAnalytics.appInstanceID);
 FirebaseAnalytics.log('My Event', { /* Optional arguments */ });
 
 // Set user-property string
-FirebaseAnalytics.setUserPropertyString({
+FirebaseAnalytics.saveUserProperty({
 	name: 'My Name',
 	value: 'My Value'
 });
 
+// Set consents
+FirebaseAnalytics.setConsent({
+	analyticsStorage: true,
+	adStorage: true,
+	adUserData: true,
+	adPersonalization: true
+});
+
 // Set User-ID
 FirebaseAnalytics.setUserID('MyUserID');
 

example/app.js

@@ -15,6 +15,8 @@
 
 - (void)setUserPropertyString:(id)arguments; // DEPRECATED: Use "saveUserProperty(arguments)" method instead
 
+- (void)setConsent:(id)arguments;
+
 - (void)setUserID:(NSString *)userID;
 
 - (void)setEnabled:(NSNumber *)enabled;

ios/Classes/FirebaseAnalyticsModule.h

@@ -67,6 +67,25 @@ - (void)saveUserProperty:(id)arguments
                               forName:name];
 }
 
+- (void)setConsent:(id)arguments
+{
+    ENSURE_SINGLE_ARG(arguments, NSDictionary);
+
+    BOOL analyticsStorage = [TiUtils boolValue:@"analyticsStorage" properties:arguments def:NO];
+    BOOL adStorage = [TiUtils boolValue:@"adStorage" properties:arguments def:NO];
+    BOOL adUserData = [TiUtils boolValue:@"adUserData" properties:arguments def:NO];
+    BOOL adPersonalization = [TiUtils boolValue:@"adPersonalization" properties:arguments def:NO];
+
+    NSDictionary *consentDictionary = @{
+        FIRConsentTypeAnalyticsStorage : analyticsStorage ? FIRConsentStatusGranted : FIRConsentStatusDenied,
+        FIRConsentTypeAdStorage : adStorage ? FIRConsentStatusGranted : FIRConsentStatusDenied,
+        FIRConsentTypeAdUserData : adUserData ? FIRConsentStatusGranted : FIRConsentStatusDenied,
+        FIRConsentTypeAdPersonalization : adPersonalization ? FIRConsentStatusGranted : FIRConsentStatusDenied
+    };
+    
+    [FIRAnalytics setConsent:consentDictionary];
+}
+
 - (void)setUserID:(id)userID
 {
   if (IS_NULL_OR_NIL(userID)) {

ios/Classes/FirebaseAnalyticsModule.m

@@ -2,10 +2,11 @@
  * This is a generated file. Do not edit or your changes will be lost
  */
 
-@interface FirebaseAnalyticsModuleAssets : NSObject
-{
+@interface FirebaseAnalyticsModuleAssets : NSObject {
+
 }
-- (NSData*) moduleAsset;
-- (NSData*) resolveModuleAsset:(NSString*)path;
+
+- (NSData *)moduleAsset;
+- (NSData *)resolveModuleAsset:(NSString*)path;
 
 @end