From fb6a8707b6fefdbdad83a940ee5ac6f8e9333972 Mon Sep 17 00:00:00 2001 From: Thomas Alrek Date: Fri, 9 Jun 2017 13:14:42 +0200 Subject: [PATCH 1/5] setAnalyticsCollectionEnabled --- src/android/FirebasePlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/android/FirebasePlugin.java b/src/android/FirebasePlugin.java index a8867b13a..7e4431dfa 100755 --- a/src/android/FirebasePlugin.java +++ b/src/android/FirebasePlugin.java @@ -51,6 +51,7 @@ protected void pluginInitialize() { public void run() { Log.d(TAG, "Starting Firebase plugin"); mFirebaseAnalytics = FirebaseAnalytics.getInstance(context); + mFirebaseAnalytics.setAnalyticsCollectionEnabled(true); if (extras != null && extras.size() > 1) { if (FirebasePlugin.notificationStack == null) { FirebasePlugin.notificationStack = new ArrayList(); From e7b0804ff30fac36715d35ec2e399a8e1b5960f1 Mon Sep 17 00:00:00 2001 From: Thomas Alrek Date: Fri, 9 Jun 2017 13:16:35 +0200 Subject: [PATCH 2/5] Add com.google.android.gms.measurement.AppMeasurementService to AndroidManifest --- plugin.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin.xml b/plugin.xml index 7cf5b5aae..04b3219c6 100644 --- a/plugin.xml +++ b/plugin.xml @@ -31,6 +31,9 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + + + From b7182e6359423f8539f7957c688c1ab9c3ef4cd0 Mon Sep 17 00:00:00 2001 From: Erik Djupvik Date: Fri, 9 Jun 2017 13:53:38 +0200 Subject: [PATCH 3/5] Moved enabling of AppMeasurementService to /manifest/application --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 04b3219c6..0b0077eef 100644 --- a/plugin.xml +++ b/plugin.xml @@ -31,7 +31,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + From f95db665b94d491e36abe349288e129dd45fde7c Mon Sep 17 00:00:00 2001 From: Erik Djupvik Date: Fri, 9 Jun 2017 14:21:52 +0200 Subject: [PATCH 4/5] Fix app crashing when receiving push notification in Android --- plugin.xml | 1 + src/android/colors.xml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 src/android/colors.xml diff --git a/plugin.xml b/plugin.xml index 04b3219c6..fae5d744e 100644 --- a/plugin.xml +++ b/plugin.xml @@ -52,6 +52,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + diff --git a/src/android/colors.xml b/src/android/colors.xml new file mode 100644 index 000000000..6f1665a52 --- /dev/null +++ b/src/android/colors.xml @@ -0,0 +1,6 @@ + + + #FFFFFF00 + #FF220022 + #FF00FFFF + \ No newline at end of file From 9eecdf9c814cad4e3588ed23276da1b76b4be438 Mon Sep 17 00:00:00 2001 From: Erik Djupvik Date: Fri, 9 Jun 2017 14:22:23 +0200 Subject: [PATCH 5/5] Copy GoogleService-Info.plist content to all locations required --- scripts/after_prepare.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/after_prepare.js b/scripts/after_prepare.js index ed0250bda..8e77bfadb 100755 --- a/scripts/after_prepare.js +++ b/scripts/after_prepare.js @@ -41,6 +41,7 @@ if (directoryExists("platforms/ios")) { try { var contents = fs.readFileSync(paths[i]).toString(); fs.writeFileSync("platforms/ios/" + name + "/Resources/GoogleService-Info.plist", contents) + fs.writeFileSync("platforms/ios/" + name + "/Resources/Resources/GoogleService-Info.plist", contents) } catch(err) { process.stdout.write(err); }