Merge pull request react-native-maps#449 from alvinthen/use-activity

Use Activity to initialize Google Map
JAStanton · Sep 2, 2016 · a7a5a50 · a7a5a50
1 parent 652c812
commit a7a5a50
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapManager.java b/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapManager.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
@@ -40,9 +41,9 @@ public class AirMapManager extends ViewGroupManager<AirMapView> {
 
     private ReactContext reactContext;
 
-    private final Context appContext;
+    private final ReactApplicationContext appContext;
 
-    public AirMapManager(Context context) {
+    public AirMapManager(ReactApplicationContext context) {
         this.appContext = context;
     }
 
@@ -56,7 +57,7 @@ protected AirMapView createViewInstance(ThemedReactContext context) {
         reactContext = context;
 
         try {
-            MapsInitializer.initialize(this.appContext);
+            MapsInitializer.initialize(new AirMapModule(this.appContext).getActivity());
         } catch (RuntimeException e) {
             e.printStackTrace();
             emitMapError("Map initialize error", "map_init_error");

diff --git a/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapModule.java b/android/lib/src/main/java/com/airbnb/android/react/maps/AirMapModule.java
@@ -0,0 +1,22 @@
+package com.airbnb.android.react.maps;
+
+import android.app.Activity;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+
+public class AirMapModule extends ReactContextBaseJavaModule {
+
+    public AirMapModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @Override
+    public String getName() {
+        return "AirMapModule";
+    }
+
+    public Activity getActivity() {
+        return getCurrentActivity();
+    }
+}
diff --git a/android/lib/src/main/java/com/airbnb/android/react/maps/MapsPackage.java b/android/lib/src/main/java/com/airbnb/android/react/maps/MapsPackage.java
@@ -33,7 +33,7 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext
         AirMapPolylineManager polylineManager = new AirMapPolylineManager(reactContext);
         AirMapPolygonManager polygonManager = new AirMapPolygonManager(reactContext);
         AirMapCircleManager circleManager = new AirMapCircleManager(reactContext);
-        AirMapManager mapManager = new AirMapManager(reactContext.getBaseContext());
+        AirMapManager mapManager = new AirMapManager(reactContext);
 
         return Arrays.<ViewManager>asList(
                 calloutManager,