Merge pull request #24 from Astrovic/master

[Android] Makes compatible with the firebase.core 11.0.4 lib to use GDPR  FirebaseAnalytics.enabled property

Author: hansemannn

README.md

@@ -1,7 +1,7 @@
 # Firebase Analytics - Titanium Module
 Use the native Firebase SDK in Axway Titanium. This repository is part of the [Titanium Firebase](https://github.com/hansemannn/titanium-firebase) project.
 
-⚠️ This module already comply to the EU General Data Protection Regulation ([GDPR](https://www.eugdpr.org/)) regulation already. 
+⚠️ This module already comply to the EU General Data Protection Regulation ([GDPR](https://www.eugdpr.org/)) regulation already.
 Use the `enabled` property to enable or disable Analytics and `resetAnalyticsData()` to make Cambridge Analytica angry 😙.
 
 ## Requirements
@@ -21,14 +21,14 @@ No additional setup required for Firebase Analytics on iOS.
 
 There are a few additional requirements for Firebase Analytics on Android:
 
-1. Copy the following code under the `<application>` tag of your tiapp.xml. Please note to replace 
+1. Copy the following code under the `<application>` tag of your tiapp.xml. Please note to replace
 all occurrences of `MY_PACKAGE_NAME` with your actual package name (= `<id>` in your tiapp.xml):
 
 ```xml
 <android xmlns:android="http://schemas.android.com/apk/res/android">
 	<manifest>
 		<application>
-			<service android:name="com.google.android.gms.measurement.AppMeasurementService" android:enabled="true" android:exported="false" />	
+			<service android:name="com.google.android.gms.measurement.AppMeasurementService" android:enabled="true" android:exported="false" />
 
 			<service android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE" android:enabled="true" android:exported="false" />
 
@@ -65,7 +65,7 @@ all occurrences of `MY_PACKAGE_NAME` with your actual package name (= `<id>` in
 2. Create a file `strings.xml` that is located at:
    - Alloy: `<project-dir>/app/platform/android/res/values/strings.xml`
    - Classic: `<project-dir>/platform/android/res/values/strings.xml`
- 
+
    with your Firebase Application ID (mobilesdk_app_id from the JSON file) content:
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -87,44 +87,44 @@ all occurrences of `MY_PACKAGE_NAME` with your actual package name (= `<id>` in
 ##### `log(name, parameters)`
   - `name` (String)
   - `parameters` (Dictionary, optional)
-  
-Logs an app event. The event can have up to 25 parameters. Events with the same name must 
+
+Logs an app event. The event can have up to 25 parameters. Events with the same name must
 have the same parameters. Up to 500 event names are supported.
-  
+
 Make sure to check the [Log Events](https://firebase.google.com/docs/analytics/android/events) docs to validate
   that you are using a valid event name (1st parameter) and parameter structure (2nd event).
-  
+
 ##### `setUserPropertyString(parameters)`
   - `parameters` (Dictionary)
     - `value` (String)
     - `name` (String)
 
-Sets a user property to a given value. Up to 25 user property names are supported. Once set, user 
+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.
 
 ##### `setScreenNameAndScreenClass(parameters)`
   - `parameters` (Dictionary)
     - `screenName` (String)
     - `screenClass` (String, iOS only)
-    
-Sets the current screen name, which specifies the current visual context in your app. This helps identify 
+
+Sets the current screen name, which specifies the current visual context in your app. This helps identify
 the areas in your app where users spend their time and how they interact with your app.
 
 
-##### `resetAnalyticsData()`
+##### `resetAnalyticsData()` (iOS-only, on  Android requires /lib version > 11.6.0)
 
 Clears all analytics data for this app from the device and resets the app instance id.
 
 #### Properties
 
 ##### `enabled` (Boolean, set)
 
-Sets whether analytics collection is enabled for this app on this device. This setting is persisted across 
+Sets whether analytics collection is enabled for this app on this device. This setting is persisted across
 app sessions. By default it is enabled.
 
 ##### `appInstanceID` (String, get, iOS-only)
 
-Instance ID provides a unique identifier for each app instance and a mechanism to authenticate and authorize 
+Instance ID provides a unique identifier for each app instance and a mechanism to authenticate and authorize
 actions (for example, sending an FCM message).
 
 ##### `userID` (String, set, iOS-only)
@@ -182,4 +182,4 @@ appc run -p [ios|android] --build-only
 
 ## Legal
 
-This module is Copyright (c) 2017-Present by Hans Knöchel. All Rights Reserved. 
+This module is Copyright (c) 2017-Present by Hans Knöchel. All Rights Reserved.

android/build.gradle

@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-compile 'com.google.firebase:firebase-analytics:15.0.0'
-compile 'com.google.firebase:firebase-analytics-impl:15.0.0'
+compile 'com.google.firebase:firebase-analytics:11.0.4'
+compile 'com.google.firebase:firebase-analytics-impl:11.0.4'
 }
 
 configurations.all {

android/java-sources.txt

@@ -1,11 +1,8 @@
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/java/firebase/analytics/TitaniumFirebaseAnalyticsBootstrap.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/r/android/support/compat/R.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/r/android/support/design/R.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/r/android/support/v7/appcompat/R.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/r/android/support/v7/cardview/R.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/r/com/google/android/gms/R.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/measurement/R.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/measurement_impl/R.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/r/firebase/analytics/R.java"
-"/Users/hknoechel/Documents/appcelerator_modules/titanium-firebase/titanium-firebase-analytics/android/build/generated/r/ti/modules/titanium/ui/R.java"
+"/Users/Astrovic/Dati/Applicazioni/titanium-firebase-analytics/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java"
+"/Users/Astrovic/Dati/Applicazioni/titanium-firebase-analytics/android/build/generated/java/firebase/analytics/TitaniumFirebaseAnalyticsBootstrap.java"
+"/Users/Astrovic/Dati/Applicazioni/titanium-firebase-analytics/android/build/generated/r/android/support/compat/R.java"
+"/Users/Astrovic/Dati/Applicazioni/titanium-firebase-analytics/android/build/generated/r/android/support/design/R.java"
+"/Users/Astrovic/Dati/Applicazioni/titanium-firebase-analytics/android/build/generated/r/android/support/v7/appcompat/R.java"
+"/Users/Astrovic/Dati/Applicazioni/titanium-firebase-analytics/android/build/generated/r/android/support/v7/cardview/R.java"
+"/Users/Astrovic/Dati/Applicazioni/titanium-firebase-analytics/android/build/generated/r/firebase/analytics/R.java"
+"/Users/Astrovic/Dati/Applicazioni/titanium-firebase-analytics/android/build/generated/r/ti/modules/titanium/ui/R.java"

android/lib/firebase-analytics-11.0.4.aar

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

android/lib/firebase-analytics-15.0.0.aar

@@ -1,11 +1,10 @@
 /**
- * This file was auto-generated by the Titanium Module SDK helper for Android
- * Appcelerator Titanium Mobile
- * Copyright (c) 2009-2010 by Appcelerator, Inc. All Rights Reserved.
+ * Ti.FirebaseAnalytics
+ * Copyright (c) 2018 by Hans Knöchel.
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
- *
  */
+
 package firebase.analytics;
 
 import org.appcelerator.kroll.annotations.Kroll;
@@ -39,7 +38,7 @@ private FirebaseAnalytics analyticsInstance()
     if (mFirebaseAnalytics == null) {
       mFirebaseAnalytics = FirebaseAnalytics.getInstance(getActivity().getApplicationContext());
     }
-    
+
     return mFirebaseAnalytics;
   }
 
@@ -52,7 +51,9 @@ public void log(String name, @Kroll.argument(optional = true) KrollDict paramete
   @Kroll.method
   public void resetAnalyticsData()
   {
-    this.analyticsInstance().resetAnalyticsData();
+    // TODO: Uncomment once Ti.PlayServices >= 11.6.0 is used
+    // this.analyticsInstance().resetAnalyticsData();
+    Log.e("FirebaseAnalytics", "The \"resetAnalyticsData()\" method on Android requires Ti.PlayServices >= 11.6.0");
   }
 
   @Kroll.method @Kroll.setProperty