Skip to content

Commit

Permalink
Merge pull request #30 from Brianggalvez/master
Browse files Browse the repository at this point in the history
Android - added setUserId method
  • Loading branch information
hansemannn authored Jan 14, 2019
2 parents b4e5855 + 5b81de9 commit 8a065a4
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ android/.classpath
android/.settings
android/dist/
android/launch-*
android/java-sources.txt
nbproject
/metadata.json
ios/firebase.analytics-iphone-*.zip
Expand Down
36 changes: 18 additions & 18 deletions android/java-sources.txt
Original file line number Diff line number Diff line change
@@ -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"
"/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"
2 changes: 1 addition & 1 deletion android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 8a065a4

Please sign in to comment.