Skip to content

Commit 9943f99

Browse files
committed
A bunch of android improvements to get things compiling.
1 parent e965a64 commit 9943f99

File tree

3 files changed

+14
-31
lines changed

3 files changed

+14
-31
lines changed

android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,7 @@ repositories {
3434
}
3535

3636
dependencies {
37-
compile 'com.facebook.react:react-native:0.18.+'
37+
compile 'com.facebook.react:react-native:+'
38+
compile 'com.google.firebase:firebase-core:9.4.0+'
39+
compile 'com.google.firebase:firebase-config:9.4.0+'
3840
}
Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,13 @@
11
package org.jall.reactnative.firebase;
22

33
import android.app.Activity;
4-
import android.util.Log;
54

6-
import com.crashlytics.android.answers.AddToCartEvent;
7-
import com.crashlytics.android.answers.Answers;
8-
import com.crashlytics.android.answers.AnswersEvent;
9-
import com.crashlytics.android.answers.ContentViewEvent;
10-
import com.crashlytics.android.answers.CustomEvent;
11-
import com.crashlytics.android.answers.InviteEvent;
12-
import com.crashlytics.android.answers.LevelEndEvent;
13-
import com.crashlytics.android.answers.LevelStartEvent;
14-
import com.crashlytics.android.answers.LoginEvent;
15-
import com.crashlytics.android.answers.PredefinedEvent;
16-
import com.crashlytics.android.answers.PurchaseEvent;
17-
import com.crashlytics.android.answers.RatingEvent;
18-
import com.crashlytics.android.answers.SearchEvent;
19-
import com.crashlytics.android.answers.ShareEvent;
20-
import com.crashlytics.android.answers.SignUpEvent;
21-
import com.crashlytics.android.answers.StartCheckoutEvent;
225
import com.facebook.react.bridge.Arguments;
236
import com.facebook.react.bridge.ReactApplicationContext;
247
import com.facebook.react.bridge.ReactContextBaseJavaModule;
258
import com.facebook.react.bridge.ReactMethod;
269
import com.facebook.react.bridge.ReadableMap;
27-
import com.facebook.react.bridge.ReadableMapKeySetIterator;
28-
import com.facebook.react.bridge.ReadableType;
29-
30-
import java.math.BigDecimal;
31-
import java.util.Currency;
10+
import com.google.firebase.analytics.FirebaseAnalytics;
3211

3312
public class FBAnalytics extends ReactContextBaseJavaModule {
3413
public Activity activity;
@@ -44,34 +23,34 @@ public String getName() {
4423
}
4524

4625
@ReactMethod
47-
public void logEvent(final ReadableMap eventName, final ReadableMap parameters) {
48-
FirebaseAnalytics.getInstance().logEvent(name, Arguments.toBundle(parameters));
26+
public void logEvent(final String name, final ReadableMap parameters) {
27+
FirebaseAnalytics.getInstance(activity).logEvent(name, Arguments.toBundle(parameters));
4928
}
5029

5130
@ReactMethod
5231
public void setUserId(String id) {
53-
FirebaseAnalytics.getInstance().setUserId(id);
32+
FirebaseAnalytics.getInstance(activity).setUserId(id);
5433
}
5534

5635
@ReactMethod
5736
public void setUserProperty(String name, String value) {
58-
FirebaseAnalytics.getInstance().setUserProperty(name, value);
37+
FirebaseAnalytics.getInstance(activity).setUserProperty(name, value);
5938
}
6039

6140

6241
@ReactMethod
6342
public void setAnalyticsCollectionEnabled(boolean enabled) {
64-
FirebaseAnalytics.getInstance().setAnalyticsCollectionEnabled(enabled);
43+
FirebaseAnalytics.getInstance(activity).setAnalyticsCollectionEnabled(enabled);
6544
}
6645

6746
@ReactMethod
6847
public void setMinimumSessionDuration(double seconds) {
69-
FirebaseAnalytics.getInstance().setMinimumSessionDuration((long)(seconds * 1000));
48+
FirebaseAnalytics.getInstance(activity).setMinimumSessionDuration((long)(seconds * 1000));
7049
}
7150

7251
@ReactMethod
7352
public void setSessionTimeoutDuration(double seconds) {
74-
FirebaseAnalytics.getInstance().setSessionTimeoutDuration((long)(seconds * 1000));
53+
FirebaseAnalytics.getInstance(activity).setSessionTimeoutDuration((long)(seconds * 1000));
7554
}
7655

7756
}

android/src/main/java/org/jall/reactnative/firebase/FBRemoteConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.jall.reactnative.firebase;
22

33
import android.app.Activity;
4-
import android.util.Log;
54

5+
import com.facebook.react.bridge.Promise;
66
import com.facebook.react.bridge.ReactApplicationContext;
77
import com.facebook.react.bridge.ReactContextBaseJavaModule;
88
import com.facebook.react.bridge.ReactMethod;
9+
import com.facebook.react.bridge.ReadableMap;
10+
import com.facebook.react.bridge.ReadableNativeMap;
911
import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
1012

1113
public class FBRemoteConfig extends ReactContextBaseJavaModule {

0 commit comments

Comments
 (0)