#128 Android analytics: Error in firebase.logEvent: Error: java.lang.NullPointerException: null reference

EddyVerbruggen · EddyVerbruggen · commit c3038876586d · 2016-09-10T16:19:30.000+02:00
diff --git a/firebase.android.js b/firebase.android.js
@@ -300,7 +300,7 @@ firebase.analytics.logEvent = function (arg) {
         }
       }
 
-      com.google.firebase.analytics.FirebaseAnalytics.getInstance(appModule.android.currentContext).logEvent(arg.key, bundle);
+      com.google.firebase.analytics.FirebaseAnalytics.getInstance(appModule.android.currentContext || appModule.android.context).logEvent(arg.key, bundle);
 
       resolve();
     } catch (ex) {
@@ -322,7 +322,7 @@ firebase.analytics.setUserProperty = function (arg) {
         return;
       }
 
-      com.google.firebase.analytics.FirebaseAnalytics.getInstance(appModule.android.currentContext).setUserProperty(arg.key, arg.value);
+      com.google.firebase.analytics.FirebaseAnalytics.getInstance(appModule.android.currentContext || appModule.android.context).setUserProperty(arg.key, arg.value);
 
       resolve();
     } catch (ex) {

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ firebase.analytics.logEvent = function (arg) {`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`
`303`		`- com.google.firebase.analytics.FirebaseAnalytics.getInstance(appModule.android.currentContext).logEvent(arg.key, bundle);`
	`303`	`+ com.google.firebase.analytics.FirebaseAnalytics.getInstance(appModule.android.currentContext \|\| appModule.android.context).logEvent(arg.key, bundle);`
`304`	`304`
`305`	`305`	`resolve();`
`306`	`306`	`} catch (ex) {`
`@@ -322,7 +322,7 @@ firebase.analytics.setUserProperty = function (arg) {`
`322`	`322`	`return;`
`323`	`323`	`}`
`324`	`324`
`325`		`- com.google.firebase.analytics.FirebaseAnalytics.getInstance(appModule.android.currentContext).setUserProperty(arg.key, arg.value);`
	`325`	`+ com.google.firebase.analytics.FirebaseAnalytics.getInstance(appModule.android.currentContext \|\| appModule.android.context).setUserProperty(arg.key, arg.value);`
`326`	`326`
`327`	`327`	`resolve();`
`328`	`328`	`} catch (ex) {`