@situm/cordova 3.15.62 → 3.16.1

package/CHANGELOG_UNRELEASED.md

@@ -1,2 +1,6 @@
-### Fixed
-- Added defensive code to avoid race conditions when using ttsManager variable at PluginHelper.java
+## Unreleased
+
+### Updated
+- Updated Android example app targetSdkVersion and compileSdkVersion from 33 to 37.
+- Updated gradle wrapper version from 8.4 to 8.13.
+- Updated AGP (com.android.application) from 8.0.0 to 8.13.2.

package/example/android/app/capacitor.build.gradle

@@ -17,8 +17,7 @@ dependencies {
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-preferences')
     implementation project(':capacitor-status-bar')
-    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    implementation "androidx.appcompat:appcompat:1.3.1"
+
 }
 apply from: "../../../src/android/situm.gradle"
 

package/example/android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.13.2'
         classpath 'com.google.gms:google-services:4.3.15'
 
         // NOTE: Do not place your application dependencies here; they belong

package/example/android/capacitor.settings.gradle

@@ -1,27 +1,27 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@5.5.1_@capacitor+core@5.7.8/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/app/android')
 
 include ':capacitor-camera'
-project(':capacitor-camera').projectDir = new File('../node_modules/@capacitor/camera/android')
+project(':capacitor-camera').projectDir = new File('../../node_modules/.pnpm/@capacitor+camera@5.0.10_@capacitor+core@5.7.8/node_modules/@capacitor/camera/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../../node_modules/.pnpm/@capacitor+filesystem@5.2.2_@capacitor+core@5.7.8/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-geolocation'
-project(':capacitor-geolocation').projectDir = new File('../node_modules/@capacitor/geolocation/android')
+project(':capacitor-geolocation').projectDir = new File('../../node_modules/.pnpm/@capacitor+geolocation@5.0.8_@capacitor+core@5.7.8/node_modules/@capacitor/geolocation/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-preferences'
-project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')
+project(':capacitor-preferences').projectDir = new File('../../node_modules/.pnpm/@capacitor+preferences@5.0.8_@capacitor+core@5.7.8/node_modules/@capacitor/preferences/android')
 
 include ':capacitor-status-bar'
-project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
+project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@capacitor+status-bar@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/status-bar/android')

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

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/example/android/variables.gradle

@@ -1,7 +1,7 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 33
-    targetSdkVersion = 33
+    compileSdkVersion = 37
+    targetSdkVersion = 37
     androidxActivityVersion = '1.7.0'
     androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'

package/example/src/app/sdk/sdk.page.html

@@ -93,16 +93,16 @@
   </ion-card>
 
   <ion-card>
+    <ion-card-header>
+      <ion-card-title>{{ currentStatus }}</ion-card-title>
+    </ion-card-header>
     <ion-card-content>
-      <ion-item>
-        <ion-label>{{ currentStatus }}</ion-label>
-      </ion-item>
-
       <ion-textarea
-        class="custom"
+        class="positioning-info-textarea"
         [readonly]="true"
-        placeholder="{{ currentPositioningInfo }}"
-        style="height: 60vh"
+        [autoGrow]="false"
+        rows="45"
+        value="{{ currentPositioningInfo }}"
       />
     </ion-card-content>
   </ion-card>

package/example/src/app/sdk/sdk.page.scss

@@ -18,7 +18,9 @@ ion-item.custom {
   --margin-end: 0px;
 }
 
-ion-textarea.custom {
-  --placeholder-color: black;
-  --placeholder-opacity: 1;
+ion-textarea.positioning-info-textarea {
+  display: block;
+  max-height: 200vh;
+  overflow-y: auto;
+  --color: var(--ion-color-dark);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@situm/cordova",
-  "version": "3.15.62",
+  "version": "3.16.1",
   "description": "Situm Wayfinding for Capacitor and Cordova. Integrate plug&play indoor navigation experience with floorplans, POIs, routes and turn-by-turn directions in no time. With the power of Situm.",
   "private": false,
   "repository": "https://github.com/situmtech/cordova",

package/plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="@situm/cordova"
-    version="3.15.62">
+    version="3.16.1">
     <name>Situm Cordova plugin Official</name>
     <description>This is the stable branch.</description>
     <license>MIT</license>

package/src/android/app/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     implementation ('com.googlecode.json-simple:json-simple:1.1.1'){
         exclude group: 'junit', module:'junit'
     }
-    implementation ('es.situm:situm-sdk:3.37.0@aar') {
+    implementation ('es.situm:situm-sdk:3.37.1@aar') {
         transitive = true
     }
     implementation 'org.apache.cordova:framework:10.1.1'

package/src/android/app/src/main/java/es/situm/plugin/SitumPlugin.java

@@ -86,6 +86,14 @@ public class SitumPlugin extends CordovaPlugin {
       String email = args.getString(0);
       String password = args.getString(1);
       es.situm.sdk.SitumSdk.configuration().setUserPass(email, password);
+    } else if (action.equalsIgnoreCase("setToken")) {
+      try {
+        String token = args.getString(0);
+        es.situm.sdk.SitumSdk.configuration().setToken(token);
+      } catch(IllegalArgumentException e) {
+        Log.d(TAG,"Error setting authentication token: " + e);
+        return false;  
+      }
     } else if (action.equalsIgnoreCase("setCacheMaxAge")) {    
       Integer cacheAge = args.getInt(0);
       Log.d(TAG,"Setting cache max age to " + cacheAge + " seconds");

package/src/android/situm.gradle

@@ -12,7 +12,7 @@ allprojects {
 
 dependencies {
     implementation 'com.google.android.gms:play-services-location:16.0.0'
-    implementation('es.situm:situm-sdk:3.37.0@aar') {
+    implementation('es.situm:situm-sdk:3.37.1@aar') {
         transitive = true
     }
 }

package/src/ios/situmcordovaplugin/SitumPlugin.h

@@ -17,6 +17,7 @@
 // The hooks for our plugin commands
 - (void)setApiKey:(CDVInvokedUrlCommand *)command;
 - (void)setUserPass:(CDVInvokedUrlCommand *)command;
+- (void)setToken:(CDVInvokedUrlCommand *)command;
 - (void)getDeviceId:(CDVInvokedUrlCommand *)command;
 - (void)startPositioning:(CDVInvokedUrlCommand *)command;
 - (void)setUseRemoteConfig:(CDVInvokedUrlCommand *)command;

package/src/ios/situmcordovaplugin/SitumPlugin.m

@@ -29,7 +29,22 @@ static NSString *DEFAULT_SITUM_LOG = @"SitumSDK >>: ";
 - (void)setApiKey:(CDVInvokedUrlCommand *)command {
     NSString* email = [command.arguments objectAtIndex:0];
     NSString* apiKey = [command.arguments objectAtIndex:1];
-    [SITServices provideAPIKey:apiKey forEmail:email];
+    [SITServices setApiKey:apiKey];
+    
+    if (IS_LOG_ENABLED) {
+        NSArray *allPaths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+        NSString *documentsDirectory = [allPaths objectAtIndex:0];
+        NSString *pathForLog = [documentsDirectory stringByAppendingPathComponent:@"logging.txt"];
+        freopen([pathForLog cStringUsingEncoding:NSASCIIStringEncoding],"a+",stderr);
+
+        NSLog(@"%@", [NSString stringWithFormat: @"%@ Logging ios calls", DEFAULT_SITUM_LOG]);
+    }
+
+}
+
+- (void)setToken:(CDVInvokedUrlCommand *)command {
+    NSString* token = [command.arguments objectAtIndex:0];
+    [SITServices setToken:token];
     
     if (IS_LOG_ENABLED) {
         NSArray *allPaths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
@@ -50,7 +65,7 @@ static NSString *DEFAULT_SITUM_LOG = @"SitumSDK >>: ";
 - (void)setUserPass:(CDVInvokedUrlCommand *)command {
     NSString* email = [command.arguments objectAtIndex:0];
     NSString* password = [command.arguments objectAtIndex:1];
-    [SITServices provideUser:email password:password];
+    [SITServices setUser:email pass:password];
 }
 
 - (void)setCacheMaxAge:(CDVInvokedUrlCommand *)command {

package/www/map-view-controller.js

@@ -53,9 +53,11 @@ class MapViewControllerImpl {
   _mapView = undefined;
   _isNavigating = false;
   _navigationType = "";
+  _isWaitingForAuth = false;
 
   constructor() {
     Situm.internalSetEventDelegate(this._handleSdkNativeEvents.bind(this));
+    Situm.internalSetTokenCallback(this._handleTokenSet.bind(this));
   }
 
   _prepare(mapView) {
@@ -153,6 +155,9 @@ class MapViewControllerImpl {
       case 'app.map_is_ready':
         this._handleMapIsReady();
         break;
+      case 'app.ready_for_auth':
+        this._handleReadyForAuth();
+        break;
       case 'cartography.poi_selected':
         console.debug(`poi (${m.payload.identifier}) was selected`);
         const poiSelectedResult = {
@@ -215,6 +220,26 @@ class MapViewControllerImpl {
     ]);
   }
 
+  _handleReadyForAuth() {
+    this._isWaitingForAuth = true;
+    this._sendTokenToViewer(Situm.internalGetToken());
+  }
+
+  _handleTokenSet(token) {
+    if (this._isWaitingForAuth) {
+      this._sendTokenToViewer(token);
+    }
+  }
+
+  _sendTokenToViewer(token) {
+    if (!token) {
+      return;
+    }
+    this._sendMessageToViewer('app.set_auth', 
+      {jwt: token}
+    );
+  }
+
   // Fetch the given building and return it or undefined if not found.
   _ensureBuilding(buildingId, callback) {
     if (this._buildings) {

package/www/map-view.js

@@ -99,13 +99,13 @@ class MapView extends HTMLElement {
       ? this.getAttribute('language')
       : '';
 
-    let situmApiKeyQP = situmApiKey.length > 0 ? `apikey=${situmApiKey}` : '';
+    let authQP = situmApiKey.length > 0 ? `apikey=${situmApiKey}` : 'wait_for_auth=true';
     let buildingIdentifierQP =
       buildingIdentifier.length > 0 ? `&buildingid=${buildingIdentifier}` : '';
     let languageQP = language.length > 0 ? `&lng=${language}` : '';
     let deviceIdQP = deviceId ? `&deviceId=${deviceId}` : '';
 
-    let query = `${situmApiKeyQP}${buildingIdentifierQP}${languageQP}${deviceIdQP}&mode=embed`;
+    let query = `${authQP}${buildingIdentifierQP}${languageQP}${deviceIdQP}&mode=embed`;
 
     let remoteIdentifier = this.getAttribute('remote-identifier');
     if (remoteIdentifier && remoteIdentifier.length > 0) {

package/www/situm.js

@@ -3,6 +3,8 @@ const common = require('@situm/cordova.common-utils');
 
 var PLUGIN_NAME = 'SitumPlugin';
 let _internalEventDelegate = undefined;
+let _internalTokenCallback = undefined;
+let _token = String;
 
 let _clientLocationUpdateCallback;
 let _clientLocationStatusCallback;
@@ -48,6 +50,12 @@ var Situm = {
   internalHandleMapViewMessage: function(message, payload) {
     exec(() => {}, () => {}, PLUGIN_NAME, 'internalHandleMapViewMessage', [message, payload]);
   },
+  internalGetToken: function() {
+    return _token;
+  },
+  internalSetTokenCallback: function(callback) {
+    _internalTokenCallback = callback;
+  },
   /**
    * Provides your API key to the Situm SDK.
    * @description Provides your API key to the Situm SDK. This key is generated for your application in the Dashboard. Old credentials will be removed.
@@ -63,6 +71,36 @@ var Situm = {
   setUseRemoteConfig: function (useRemoteConfig, cb, error) {
     exec(cb, error, PLUGIN_NAME, 'setUseRemoteConfig', [useRemoteConfig]);
   },
+  /**
+   * Provides your token to the Situm SDK. Any previously configured credentials will be replaced.
+   * <p>The SDK does not cryptographically validate the token signature, nor does it verify the
+   * token against Situm servers when this method is called. The token is parsed locally only to
+   * obtain the account information needed by the SDK, and it will be sent as a Bearer token in
+   * subsequent authenticated network requests.</p>
+   * 
+   * <p>If the provided token is expired, has an invalid signature, or is otherwise rejected by
+   * Situm servers, network operations that require server authentication will fail. However,
+   * features that can operate with already cached local data may continue to work, such as
+   * visualizing cached resources or positioning with previously downloaded positioning data.</p>
+   * 
+   * <p>User-provided tokens cannot be renewed automatically by the SDK. To recover from an
+   * expired or rejected token, provide a new token by calling this method again.</p>
+   * 
+   * @description Provides your token to the Situm SDK. Any previously configured credentials will be replaced.
+   * @param {string} base64Token String representing the token used for authentication; must not be {@code null} or empty.
+   *                             The expected format is a base64-encoded JWT with header, payload and signature sections.
+   *                             This token can be retrieved from <a href="https://developers.situm.com/pages/rest/openapi/#tag/jwt/POST/api/v1/auth/access_tokens">a REST endpoint</a>.
+   * @param {function} cb Cordova native callback to recive data.
+   * @param {function} error Cordova native callback to recive errors.
+   * @return {boolean} success True if operation finished successfully, otherwise false
+   */
+  setToken: function (base64Token, cb, error) {
+    _token = base64Token;
+    if (_internalTokenCallback) {
+      _internalTokenCallback(base64Token);
+    }
+    exec(cb, error, PLUGIN_NAME, 'setToken', [base64Token]);
+  },
   /**
    * Provides user's email and password.
    * @description Provides user's email and password. This credentials will be used to obtain a valid user token to authenticate the server request, when necessary. Token obtaining is not necessary done when this method is executed. Old credentials will be removed.