Fix the rest of the android issues, as well as standardizing the setsetDeveloperMode api.

Author: mikelambert

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

@@ -9,12 +9,11 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.google.firebase.analytics.FirebaseAnalytics;
 
-public class FIRAnalytics extends ReactContextBaseJavaModule {
-    public Activity activity;
+import javax.annotation.Nullable;
 
-    public FIRAnalytics(ReactApplicationContext reactContext, Activity activity) {
+public class FIRAnalytics extends ReactContextBaseJavaModule {
+    public FIRAnalytics(ReactApplicationContext reactContext) {
         super(reactContext);
-        this.activity = activity;
     }
 
     @Override
@@ -23,34 +22,34 @@ public String getName() {
     }
 
     @ReactMethod
-    public void logEvent(final String name, final ReadableMap parameters) {
-        FirebaseAnalytics.getInstance(activity).logEvent(name, Arguments.toBundle(parameters));
+    public void logEvent(final String name, @Nullable final ReadableMap parameters) {
+        FirebaseAnalytics.getInstance(getCurrentActivity()).logEvent(name, Arguments.toBundle(parameters));
     }
 
     @ReactMethod
     public void setUserId(String id) {
-        FirebaseAnalytics.getInstance(activity).setUserId(id);
+        FirebaseAnalytics.getInstance(getCurrentActivity()).setUserId(id);
     }
 
     @ReactMethod
     public void setUserProperty(String name, String value) {
-        FirebaseAnalytics.getInstance(activity).setUserProperty(name, value);
+        FirebaseAnalytics.getInstance(getCurrentActivity()).setUserProperty(name, value);
     }
 
 
     @ReactMethod
     public void setAnalyticsCollectionEnabled(boolean enabled) {
-        FirebaseAnalytics.getInstance(activity).setAnalyticsCollectionEnabled(enabled);
+        FirebaseAnalytics.getInstance(getCurrentActivity()).setAnalyticsCollectionEnabled(enabled);
     }
 
     @ReactMethod
     public void setMinimumSessionDuration(double seconds) {
-        FirebaseAnalytics.getInstance(activity).setMinimumSessionDuration((long)(seconds * 1000));
+        FirebaseAnalytics.getInstance(getCurrentActivity()).setMinimumSessionDuration((long)(seconds * 1000));
     }
 
     @ReactMethod
     public void setSessionTimeoutDuration(double seconds) {
-        FirebaseAnalytics.getInstance(activity).setSessionTimeoutDuration((long)(seconds * 1000));
+        FirebaseAnalytics.getInstance(getCurrentActivity()).setSessionTimeoutDuration((long)(seconds * 1000));
     }
 
 }

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

@@ -17,11 +17,8 @@
 import java.util.HashMap;
 
 public class FIRRemoteConfig extends ReactContextBaseJavaModule {
-    public Activity activity;
-
-    public FIRRemoteConfig(ReactApplicationContext reactContext, Activity activity) {
+    public FIRRemoteConfig(ReactApplicationContext reactContext) {
         super(reactContext);
-        this.activity = activity;
     }
 
     @Override
@@ -30,7 +27,7 @@ public String getName() {
     }
 
     @ReactMethod
-    public void setDeveloperMode(boolean enabled) {
+    public void setDeveloperMode(Boolean enabled) {
         FirebaseRemoteConfigSettings configSettings = new FirebaseRemoteConfigSettings.Builder()
                 .setDeveloperModeEnabled(enabled)
                 .build();
@@ -50,8 +47,8 @@ public void fetch() {
     }
 
     @ReactMethod
-    public void fetchWithExpirationDuration(long cacheExpirationSeconds) {
-        FirebaseRemoteConfig.getInstance().fetch(cacheExpirationSeconds);
+    public void fetchWithExpirationDuration(Double cacheExpirationSeconds) {
+        FirebaseRemoteConfig.getInstance().fetch(cacheExpirationSeconds.longValue());
     }
 
     @ReactMethod

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

@@ -13,17 +13,12 @@
 
 public class FirebasePackage implements ReactPackage {
 
-    private Activity mActivity = null;
-    public FirebasePackage(Activity activity) {
-        mActivity = activity;
-    }
-
     @Override
     public List<NativeModule> createNativeModules(
             ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
-        modules.add(new FIRRemoteConfig(reactContext, mActivity));
-        modules.add(new FIRAnalytics(reactContext, mActivity));
+        modules.add(new FIRRemoteConfig(reactContext));
+        modules.add(new FIRAnalytics(reactContext));
         return modules;
     }
 

ios/Firebase/FIRRemoteConfig.m

@@ -11,10 +11,10 @@ - (dispatch_queue_t)methodQueue
     return dispatch_get_main_queue();
 }
 
-RCT_EXPORT_METHOD(setDeveloperMode)
+RCT_EXPORT_METHOD(setDeveloperMode: (BOOL)enabled)
 {
     FIRRemoteConfig *remoteConfig = [FIRRemoteConfig remoteConfig];
-    FIRRemoteConfigSettings *remoteConfigSettings = [[FIRRemoteConfigSettings alloc] initWithDeveloperModeEnabled:YES];
+    FIRRemoteConfigSettings *remoteConfigSettings = [[FIRRemoteConfigSettings alloc] initWithDeveloperModeEnabled:enabled];
     remoteConfig.configSettings = remoteConfigSettings;
 }