@sentiance-react-native/legacy 6.0.0-beta.9

package/README.md

@@ -0,0 +1,34 @@
+## Installation
+
+This module requires that the `@sentiance-react-native/crash-detection` and `@sentiance-react-native/core` modules are already setup and installed.
+
+```bash
+# Install & setup the core module
+npm i @sentiance-react-native/core
+
+# Install & setup the crash detection module
+npm i @sentiance-react-native/crash-detection
+
+# Install the legacy module
+npm i @sentiance-react-native/legacy
+```
+
+## Usage
+
+### Importing the package
+
+You can import the entire contents of the package for use under a namespace of your choosing:
+
+```javascript
+import * as SentianceLegacy from "@sentiance-react-native/legacy";
+```
+
+or you can require specific functionality using named imports:
+
+```javascript
+import {
+    enableDetections,
+    invokeDummyVehicleCrash,
+    createUser
+} from "@sentiance-react-native/legacy";
+```

package/android/build.gradle

@@ -0,0 +1,40 @@
+plugins {
+  id "com.android.library"
+}
+
+def coreProj
+if (findProject(':core')) {
+  coreProj = project(':core')
+} else if (findProject(':sentiance-react-native_core')) {
+  // Starting from RN 0.61, the @ sign is stripped from project names
+  coreProj = project(':sentiance-react-native_core')
+} else if (findProject(':@sentiance-react-native_core')) {
+  // On RN 0.60, the @ sign is not stripped from project names
+  coreProj = project(':@sentiance-react-native_core')
+} else {
+  throw new GradleException('Could not find the @sentiance-react-native/core package, have you installed it?')
+}
+
+def crashDetectionProj
+if (findProject(':crash-detection')) {
+  crashDetectionProj = project(':crash-detection')
+} else if (findProject(':sentiance-react-native_crash-detection')) {
+  // Starting from RN 0.61, the @ sign is stripped from project names
+  crashDetectionProj = project(':sentiance-react-native_crash-detection')
+} else if (findProject(':@sentiance-react-native_crash-detection')) {
+  // On RN 0.60, the @ sign is not stripped from project names
+  crashDetectionProj = project(':@sentiance-react-native_crash-detection')
+} else {
+  throw new GradleException('Could not find the @sentiance-react-native/crash-detection package, have you installed it?')
+}
+
+apply from: "$coreProj.projectDir/package-json-reader.gradle"
+
+def corePackageJson = PackageJson.of(coreProj)
+applyAndroidVersionsFrom(corePackageJson)
+
+dependencies {
+  implementation crashDetectionProj
+}
+
+applyReactNativeDependency()

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/android/gradle.properties

@@ -0,0 +1,2 @@
+android.useAndroidX=true
+android.enableJetifier=true

package/android/gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://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,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

package/android/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/android/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest package="com.sentiance.react.bridge.legacy">
+</manifest>

package/android/src/main/java/com/sentiance/react/bridge/legacy/LegacySentianceModule.java

@@ -0,0 +1,316 @@
+package com.sentiance.react.bridge.legacy;
+
+import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_GET_TOKEN_ERROR;
+import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_START_TRIP_ERROR;
+import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_STOP_TRIP_ERROR;
+import static com.sentiance.react.bridge.core.utils.ErrorCodes.E_SDK_SUBMIT_DETECTIONS_ERROR;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+import com.sentiance.react.bridge.core.SentianceConverter;
+import com.sentiance.react.bridge.core.base.AbstractSentianceModule;
+import com.sentiance.sdk.OnInitCallback;
+import com.sentiance.sdk.ResetCallback;
+import com.sentiance.sdk.SdkStatus;
+import com.sentiance.sdk.SubmitDetectionsCallback;
+import com.sentiance.sdk.Token;
+import com.sentiance.sdk.TokenResultCallback;
+import com.sentiance.sdk.trip.StartTripCallback;
+import com.sentiance.sdk.trip.StopTripCallback;
+import com.sentiance.sdk.trip.TransportMode;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class LegacySentianceModule extends AbstractSentianceModule implements LifecycleEventListener {
+
+  private static final String NATIVE_MODULE_NAME = "RNSentiance";
+  private final Handler mHandler = new Handler(Looper.getMainLooper());
+  private final RNSentianceHelper legacySentianceHelper;
+  private final StartFinishedHandlerCreator startFinishedHandlerCreator;
+
+  public LegacySentianceModule(ReactApplicationContext reactContext) {
+    super(reactContext);
+    legacySentianceHelper = RNSentianceHelper.getInstance(reactContext);
+    startFinishedHandlerCreator = new StartFinishedHandlerCreator();
+  }
+
+  @NonNull
+  @Override
+  public String getName() {
+    return NATIVE_MODULE_NAME;
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void init(final String appId, final String appSecret, @Nullable final String baseURL,
+                   final boolean shouldStart, final Promise promise) {
+    Log.v(NATIVE_MODULE_NAME, "Initializing SDK with APP_ID: " + appId);
+
+    final OnInitCallback initCallback = new OnInitCallback() {
+      @Override
+      public void onInitSuccess() {
+        if (!shouldStart)
+          promise.resolve(true);
+      }
+
+      @Override
+      public void onInitFailure(@NonNull InitIssue issue, @Nullable Throwable throwable) {
+        if (throwable != null) {
+          promise.reject(issue.name(), throwable);
+        } else {
+          promise.reject(issue.name(), "");
+        }
+      }
+    };
+
+    new Handler(Looper.getMainLooper()).post(() -> legacySentianceHelper.initializeSentianceSDK(
+      appId, appSecret,
+      shouldStart,
+      baseURL,
+      initCallback,
+      startFinishedHandlerCreator.createNewStartFinishedHandler(promise)
+    ));
+
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void initWithUserLinkingEnabled(final String appId, final String appSecret, @Nullable final String baseURL,
+                                         final boolean shouldStart, final Promise promise) {
+    Log.v(NATIVE_MODULE_NAME, "Initializing SDK with APP_ID: " + appId);
+
+    final OnInitCallback initCallback = new OnInitCallback() {
+      @Override
+      public void onInitSuccess() {
+        Log.v(NATIVE_MODULE_NAME, "onInitSuccess - shouldStart: " + shouldStart);
+        if (!shouldStart)
+          promise.resolve(true);
+      }
+
+      @Override
+      public void onInitFailure(@NonNull InitIssue issue, @Nullable Throwable throwable) {
+        Log.v(NATIVE_MODULE_NAME, "onInitFailure");
+        if (throwable != null) {
+          promise.reject(issue.name(), throwable);
+        } else {
+          promise.reject(issue.name(), "");
+        }
+      }
+    };
+
+    new Handler(Looper.getMainLooper()).post(() -> {
+      Log.v(NATIVE_MODULE_NAME, "legacySentianceHelper.initializeSentianceSDKWithUserLinking()");
+      Log.v(NATIVE_MODULE_NAME, "baseURL: " + baseURL);
+      legacySentianceHelper.initializeSentianceSDKWithUserLinking(
+        appId, appSecret,
+        shouldStart,
+        baseURL,
+        initCallback,
+        startFinishedHandlerCreator.createNewStartFinishedHandler(promise)
+      );
+    });
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void reset(final Promise promise) {
+    sdk.reset(new ResetCallback() {
+      @Override
+      public void onResetSuccess() {
+        legacySentianceHelper.disableNativeInitialization();
+        promise.resolve(true);
+      }
+
+      @Override
+      public void onResetFailure(@NonNull ResetFailureReason reason) {
+        promise.reject(reason.name(), "Resetting the SDK failed");
+      }
+    });
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void start(final Promise promise) {
+    startWithStopDate(null, promise);
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void startWithStopDate(@Nullable final Double stopEpochTimeMs, final Promise promise) {
+    if (rejectIfNotInitialized(promise)) {
+      return;
+    }
+
+    mHandler.post(() -> {
+      Long stopTime = stopEpochTimeMs == null ? null : stopEpochTimeMs.longValue();
+      legacySentianceHelper.startSentianceSDK(stopTime,
+        startFinishedHandlerCreator.createNewStartFinishedHandler(promise)
+      );
+    });
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void stop(final Promise promise) {
+    if (rejectIfNotInitialized(promise)) {
+      return;
+    }
+
+    sdk.stop();
+    promise.resolve(true);
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void startTrip(@Nullable ReadableMap metadata, int hint, final Promise promise) {
+    if (rejectIfNotInitialized(promise)) {
+      return;
+    }
+
+    Map<String, String> metadataMap = new HashMap<>();
+    if (metadata != null) {
+      for (Map.Entry<String, Object> entry : metadata.toHashMap().entrySet()) {
+        metadataMap.put(entry.getKey(), entry.getValue().toString());
+      }
+    }
+    final TransportMode transportModeHint = SentianceConverter.toTransportMode(hint);
+    sdk.startTrip(metadataMap, transportModeHint, new StartTripCallback() {
+      @Override
+      public void onSuccess() {
+        promise.resolve(true);
+      }
+
+      @Override
+      public void onFailure(SdkStatus sdkStatus) {
+        promise.reject(E_SDK_START_TRIP_ERROR, sdkStatus.toString());
+      }
+    });
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void stopTrip(final Promise promise) {
+    if (rejectIfNotInitialized(promise)) {
+      return;
+    }
+
+    sdk.stopTrip(new StopTripCallback() {
+      @Override
+      public void onSuccess() {
+        promise.resolve(true);
+      }
+
+      @Override
+      public void onFailure(SdkStatus sdkStatus) {
+        promise.reject(E_SDK_STOP_TRIP_ERROR, "");
+      }
+    });
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void setValueForKey(String key, String value) {
+    legacySentianceHelper.setValueForKey(key, value);
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void getValueForKey(String key, String defaultValue, Promise promise) {
+    String value = legacySentianceHelper.getValueForKey(key, defaultValue);
+    promise.resolve(value);
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void isThirdPartyLinked(Promise promise) {
+    promise.resolve(legacySentianceHelper.isThirdPartyLinked());
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void isNativeInitializationEnabled(Promise promise) {
+    promise.resolve(legacySentianceHelper.isNativeInitializationEnabled());
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void enableNativeInitialization(Promise promise) {
+    legacySentianceHelper.enableNativeInitialization();
+    promise.resolve(true);
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void disableNativeInitialization(Promise promise) {
+    legacySentianceHelper.disableNativeInitialization();
+    promise.resolve(true);
+  }
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void getUserAccessToken(final Promise promise) {
+    if (rejectIfNotInitialized(promise)) {
+      return;
+    }
+
+    sdk.getUserAccessToken(new TokenResultCallback() {
+      @Override
+      public void onSuccess(@NonNull Token token) {
+        promise.resolve(SentianceConverter.convertToken(token));
+      }
+
+      @Override
+      public void onFailure() {
+        promise.reject(E_SDK_GET_TOKEN_ERROR, "Something went wrong while obtaining a user token.");
+      }
+    });
+  }
+
+
+  @ReactMethod
+  @SuppressWarnings("unused")
+  public void submitDetections(final Promise promise) {
+    if (rejectIfNotInitialized(promise)) {
+      return;
+    }
+
+    sdk.submitDetections(new SubmitDetectionsCallback() {
+      @Override
+      public void onSuccess() {
+        promise.resolve(true);
+      }
+
+      @Override
+      public void onFailure() {
+        promise.reject(E_SDK_SUBMIT_DETECTIONS_ERROR, "Submission failed");
+      }
+    });
+  }
+
+  @Override
+  public void onHostResume() {
+    // Activity `onResume`
+  }
+
+  @Override
+  public void onHostPause() {
+    // Activity `onPause`
+  }
+
+  @Override
+  public void onHostDestroy() {
+    // Activity `onDestroy`
+  }
+}
+