From b3a1a39ca94000a8c3ee7472b8cd82675b0f3b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?brian=20garci=CC=81a?= Date: Mon, 14 Jan 2019 12:08:56 +0100 Subject: [PATCH 1/2] added setUserId method bump version --- android/java-sources.txt | 36 +++++++++---------- android/manifest | 2 +- .../TitaniumFirebaseAnalyticsModule.java | 6 ++++ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/android/java-sources.txt b/android/java-sources.txt index 46c7bc5..30f8636 100644 --- a/android/java-sources.txt +++ b/android/java-sources.txt @@ -1,18 +1,18 @@ -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/java/firebase/analytics/TitaniumFirebaseAnalyticsBootstrap.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/compat/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/coreui/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/coreutils/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/design/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/exifinterface/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/fragment/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/graphics/drawable/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/graphics/drawable/animated/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/mediacompat/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/transition/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v4/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v7/appcompat/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v7/cardview/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v7/recyclerview/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/firebase/analytics/R.java" -"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/ti/modules/titanium/ui/R.java" \ No newline at end of file +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/java/firebase/analytics/TitaniumFirebaseAnalyticsBootstrap.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/compat/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/coreui/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/coreutils/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/design/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/exifinterface/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/fragment/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/graphics/drawable/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/graphics/drawable/animated/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/mediacompat/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/transition/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/v4/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/v7/appcompat/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/v7/cardview/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/android/support/v7/recyclerview/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/firebase/analytics/R.java" +"/Volumes/Transcend/modules/titanium-firebase-analytics/android/build/generated/r/ti/modules/titanium/ui/R.java" \ No newline at end of file diff --git a/android/manifest b/android/manifest index 7cf6a2a..b767e68 100644 --- a/android/manifest +++ b/android/manifest @@ -2,7 +2,7 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 2.1.2 +version: 2.2.2 apiversion: 4 architectures: arm64-v8a armeabi-v7a x86 description: titanium-firebase-analytics diff --git a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java index 6a313d9..738e4a0 100644 --- a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java +++ b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java @@ -67,6 +67,12 @@ public void setUserPropertyString(KrollDict parameters) { this.analyticsInstance().setUserProperty(TiConvert.toString(parameters, "name"), TiConvert.toString(parameters, "value")); } + + @Kroll.method @Kroll.setProperty + public void setUserId(String id) + { + this.analyticsInstance().setUserId(id); + } @Kroll.method @Kroll.setProperty public void setScreenNameAndScreenClass(KrollDict parameters) From 5b81de96533ee62dcde3e6cbbad2a873a0703530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?brian=20garci=CC=81a?= Date: Mon, 14 Jan 2019 16:24:47 +0100 Subject: [PATCH 2/2] remove java-sources from git change from setUserId to setUserID for parity --- .gitignore | 1 + .../src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c248f1e..8256eac 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ android/.classpath android/.settings android/dist/ android/launch-* +android/java-sources.txt nbproject /metadata.json ios/firebase.analytics-iphone-*.zip diff --git a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java index 738e4a0..61a9beb 100644 --- a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java +++ b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java @@ -69,7 +69,7 @@ public void setUserPropertyString(KrollDict parameters) } @Kroll.method @Kroll.setProperty - public void setUserId(String id) + public void setUserID(String id) { this.analyticsInstance().setUserId(id); }