fix: android messaging channel

Author: jokerttu

.gitignore

@@ -39,6 +39,7 @@ Keys.plist
 .idea
 .project
 .settings
+.kotlin
 local.properties
 android.iml
 

.tool-versions

@@ -1 +1 @@
-nodejs 18.20.1
+nodejs 22.14.0

.yarn/releases/yarn-3.6.1.cjs .yarn/releases/yarn-3.6.4.cjs.yarn/releases/yarn-3.6.1.cjs renamed to .yarn/releases/yarn-3.6.4.cjs

@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-nodeLinker: node-modules
 nmHoistingLimits: workspaces
 
+nodeLinker: node-modules
+
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
+    spec: '@yarnpkg/plugin-interactive-tools'
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
+    spec: '@yarnpkg/plugin-workspace-tools'
 
-yarnPath: .yarn/releases/yarn-3.6.1.cjs
+yarnPath: .yarn/releases/yarn-3.6.4.cjs

.yarnrc.yml

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,16 +15,16 @@
 import groovy.json.JsonSlurper
 
 buildscript {
-    ext.kotlin_version = '2.1.21'
-    repositories {
-        google()
-        mavenCentral()
-    }
+  ext.kotlin_version = '2.1.21'
+  repositories {
+    google()
+    mavenCentral()
+  }
 
-    dependencies {
-        classpath("com.android.tools.build:gradle:8.4.0")
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
+  dependencies {
+    classpath "com.android.tools.build:gradle:8.7.2"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
 }
 
 def isNewArchitectureEnabled() {
@@ -38,44 +38,50 @@ if (isNewArchitectureEnabled()) {
 }
 
 android {
-    namespace "com.google.android.react.navsdk"
-    compileSdkVersion 35
+  namespace "com.google.android.react.navsdk"
+  compileSdkVersion 35
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 
-    defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 34
-        versionCode 1
-        // get version name from package.json version
-        versionName "1.0"
-    }
+  defaultConfig {
+    minSdkVersion 24
+    targetSdkVersion 34
+  }
 
-    buildTypes {
-        release {
-        minifyEnabled true
-        }
-    }
+  buildFeatures {
+    buildConfig true
+  }
 
-    lintOptions {
-        abortOnError false
-        disable "GradleCompatible"
+  buildTypes {
+    release {
+      minifyEnabled true
     }
+  }
+
+  lintOptions {
+    abortOnError false
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
 repositories {
-    google()
-    mavenCentral()
+  google()
+  mavenCentral()
 }
 
 dependencies {
-    implementation "androidx.car.app:app:1.4.0"
-    implementation "androidx.car.app:app-projected:1.4.0"
-    implementation 'com.facebook.react:react-native:+'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "com.google.android.libraries.navigation:navigation:6.3.1"
-    api 'com.google.guava:guava:31.0.1-android'
+  implementation 'com.facebook.react:react-native:+'
+  implementation "androidx.car.app:app:1.4.0"
+  implementation "androidx.car.app:app-projected:1.4.0"
+  implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+  implementation "com.google.android.libraries.navigation:navigation:6.3.1"
+  api 'com.google.guava:guava:31.0.1-android'
 }

android/build.gradle

@@ -14,8 +14,6 @@
 package com.google.android.react.navsdk;
 
 public class Constants {
-  public static final String NAV_JAVASCRIPT_FLAG = "NavJavascriptBridge";
-  public static final String NAV_AUTO_JAVASCRIPT_FLAG = "NavAutoJavascriptBridge";
   public static final String LAT_FIELD_KEY = "lat";
   public static final String LNG_FIELD_KEY = "lng";
 }

android/src/main/java/com/google/android/react/navsdk/Constants.java

@@ -284,8 +284,10 @@ public GroundOverlay addGroundOverlay(Map<String, Object> map) {
     Double lng = null;
     if (map.containsKey("location")) {
       Map<String, Object> latlng = (Map<String, Object>) map.get("location");
-      if (latlng.get("lat") != null) lat = Double.parseDouble(latlng.get("lat").toString());
-      if (latlng.get("lng") != null) lng = Double.parseDouble(latlng.get("lng").toString());
+      if (latlng.get(Constants.LAT_FIELD_KEY) != null)
+        lat = Double.parseDouble(latlng.get(Constants.LAT_FIELD_KEY).toString());
+      if (latlng.get(Constants.LNG_FIELD_KEY) != null)
+        lng = Double.parseDouble(latlng.get(Constants.LNG_FIELD_KEY).toString());
     }
 
     GroundOverlayOptions options = new GroundOverlayOptions();
@@ -568,9 +570,11 @@ private String fetchJsonFromUrl(String urlString) throws IOException {
   private LatLng createLatLng(Map<String, Object> map) {
     Double lat = null;
     Double lng = null;
-    if (map.containsKey("lat") && map.containsKey("lng")) {
-      if (map.get("lat") != null) lat = Double.parseDouble(map.get("lat").toString());
-      if (map.get("lng") != null) lng = Double.parseDouble(map.get("lng").toString());
+    if (map.containsKey(Constants.LAT_FIELD_KEY) && map.containsKey(Constants.LNG_FIELD_KEY)) {
+      if (map.get(Constants.LAT_FIELD_KEY) != null)
+        lat = Double.parseDouble(map.get(Constants.LAT_FIELD_KEY).toString());
+      if (map.get(Constants.LNG_FIELD_KEY) != null)
+        lng = Double.parseDouble(map.get(Constants.LNG_FIELD_KEY).toString());
     }
 
     return new LatLng(lat, lng);

android/src/main/java/com/google/android/react/navsdk/MapViewController.java

@@ -14,18 +14,18 @@
 package com.google.android.react.navsdk;
 
 import android.location.Location;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.CatalystInstance;
-import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.google.android.gms.maps.UiSettings;
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.Circle;
@@ -34,15 +34,13 @@
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.libraries.navigation.StylingOptions;
-import java.util.Map;
 
 /**
- * This exposes a series of methods that can be called diretly from the React Native code. They have
- * been implemented using promises as it's not recommended for them to be synchronous.
+ * This exposes a series of methods that can be called directly from the React Native code. They
+ * have been implemented using promises as it's not recommended for them to be synchronous.
  */
 public class NavAutoModule extends ReactContextBaseJavaModule implements INavigationAutoCallback {
   public static final String REACT_CLASS = "NavAutoModule";
-  private static final String TAG = "AndroidAutoModule";
   private static NavAutoModule instance;
   private static ModuleReadyListener moduleReadyListener;
 
@@ -64,6 +62,7 @@ public NavAutoModule(ReactApplicationContext reactContext) {
     }
   }
 
+  @NonNull
   @Override
   public String getName() {
     return REACT_CLASS;
@@ -100,13 +99,6 @@ public void androidAutoNavigationScreenDisposed() {
     mNavigationViewController = null;
   }
 
-  public void setStylingOptions(Map<String, Object> stylingOptions) {
-    mStylingOptions = new StylingOptionsBuilder.Builder(stylingOptions).build();
-    if (mStylingOptions != null && mNavigationViewController != null) {
-      mNavigationViewController.setStylingOptions(mStylingOptions);
-    }
-  }
-
   @ReactMethod
   public void setMapType(int jsValue) {
     UiThreadUtil.runOnUiThread(
@@ -408,11 +400,6 @@ public void getCameraPosition(final Promise promise) {
 
           CameraPosition cp = mMapViewController.getGoogleMap().getCameraPosition();
 
-          if (cp == null) {
-            promise.resolve(null);
-            return;
-          }
-
           LatLng target = cp.target;
           WritableMap map = Arguments.createMap();
           map.putDouble("bearing", cp.bearing);
@@ -438,7 +425,6 @@ public void getMyLocation(final Promise promise) {
             promise.resolve(ObjectTranslationUtil.getMapFromLocation(location));
           } catch (Exception e) {
             promise.resolve(null);
-            return;
           }
         });
   }
@@ -539,12 +525,11 @@ public void onCustomNavigationAutoEvent(String type, ReadableMap data) {
   }
 
   /** Send command to react native. */
-  private void sendCommandToReactNative(String functionName, NativeArray params) {
-    ReactContext reactContext = getReactApplicationContext();
-
-    if (reactContext != null) {
-      CatalystInstance catalystInstance = reactContext.getCatalystInstance();
-      catalystInstance.callFunction(Constants.NAV_AUTO_JAVASCRIPT_FLAG, functionName, params);
+  private void sendCommandToReactNative(String functionName, @Nullable Object params) {
+    if (reactContext.hasActiveReactInstance()) {
+      reactContext
+          .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+          .emit(functionName, params);
     }
   }
 }