Compatibility with older JS versions

Author: EddyVerbruggen

src/analytics/analytics-common.ts

@@ -1,7 +1,7 @@
 import { LogEventParameter } from "./analytics";
 
 export function validateAnalyticsKey(key: string): string | undefined {
-  if (key === undefined) {
+  if (key === undefined || key === null) {
     return "Argument 'key' is missing";
   }
 
@@ -13,15 +13,15 @@ export function validateAnalyticsKey(key: string): string | undefined {
     return "Argument 'key' can only contain alphanumeric characters and underscores and must start with an alphanumeric character";
   }
 
-  if (key.startsWith("firebase_")) {
+  if (key.indexOf("firebase_") === 0) {
     return "Argument 'key' must not start with 'firebase_'";
   }
 
-  if (key.startsWith("google_")) {
+  if (key.indexOf("google_") === 0) {
     return "Argument 'key' must not start with 'google_'";
   }
 
-  if (key.startsWith("ga_")) {
+  if (key.indexOf("ga_") === 0) {
     return "Argument 'key' must not start with 'ga_'";
   }
 
@@ -75,23 +75,23 @@ function validateAnalyticsParamKey(key: string): string | undefined {
 }
 
 function validateAnalyticsParamValue(value: string): string | undefined {
-  if (value === undefined) {
+  if (value === undefined || value === null) {
     return "Param 'value' is missing";
   }
 
   if (value.length > 100) {
     return "Param 'value' must be 100 characters or fewer";
   }
 
-  if (value.startsWith("firebase_")) {
+  if (value.indexOf("firebase_") === 0) {
     return "Param 'value' must not start with 'firebase_'";
   }
 
-  if (value.startsWith("google_")) {
+  if (value.indexOf("google_") === 0) {
     return "Param 'value' must not start with 'google_'";
   }
 
-  if (value.startsWith("ga_")) {
+  if (value.indexOf("ga_") === 0) {
     return "Param 'value' must not start with 'ga_'";
   }
 

src/mlkit/custommodel/custommodel-common.ts

@@ -48,7 +48,7 @@ export abstract class MLKitCustomModel extends MLKitCameraView {
 
   [labelsFileProperty.setNative](value: string) {
     this.labelsFile = value;
-    if (value.startsWith("~/")) {
+    if (value.indexOf("~/") === 0) {
       this.labels = getLabelsFromAppFolder(value);
     } else {
       // no dice loading from assets yet, let's advice users to use ~/ for now

src/mlkit/custommodel/index.android.ts

@@ -108,7 +108,7 @@ function getInterpreter(localModelFile?: string): any {
     } else {
       const firModelLocalBuilder = new com.google.firebase.ml.common.modeldownload.FirebaseLocalModel.Builder(localModelName);
 
-      if (localModelFile.startsWith("~/")) {
+      if (localModelFile.indexOf("~/") === 0) {
         firModelLocalBuilder.setFilePath(fs.knownFolders.currentApp().path + localModelFile.substring(1));
       } else {
         // note that this doesn't seem to work, let's advice users to use ~/ for now
@@ -143,7 +143,7 @@ export function useCustomModel(options: MLKitCustomModelOptions): Promise<MLKitC
       const interpreter = getInterpreter(options.localModelFile);
 
       let labels: Array<string>;
-      if (options.labelsFile.startsWith("~/")) {
+      if (options.labelsFile.indexOf("~/") === 0) {
         labels = getLabelsFromAppFolder(options.labelsFile);
       } else {
         // no dice loading from assets yet, let's advice users to use ~/ for now

src/mlkit/custommodel/index.ios.ts

@@ -113,7 +113,7 @@ function getInterpreter(localModelFile: string): FIRModelInterpreter {
       localModelRegistrationSuccess = true;
     } else {
       let localModelFilePath: string;
-      if (localModelFile.startsWith("~/")) {
+      if (localModelFile.indexOf("~/") === 0) {
         localModelFilePath = fs.knownFolders.currentApp().path + localModelFile.substring(1);
       } else {
         localModelFilePath = NSBundle.mainBundle.pathForResourceOfType(
@@ -184,7 +184,7 @@ export function useCustomModel(options: MLKitCustomModelOptions): Promise<MLKitC
       });
 
       let labels: Array<string>;
-      if (options.labelsFile.startsWith("~/")) {
+      if (options.labelsFile.indexOf("~/") === 0) {
         labels = getLabelsFromAppFolder(options.labelsFile);
       } else {
         const labelsFile = NSBundle.mainBundle.pathForResourceOfType(