incyclist-services 1.7.69 → 1.7.71

package/lib/cjs/activities/ride/service.js

@@ -261,7 +261,15 @@ let ActivityRideService = (() => {
                 catch {
                 }
                 if (showLog) {
-                    this.logEvent({ message: 'Dashboard update', items: info.map(i => `${i.title}:${i.data[0]?.value ?? ''}:${i.data[1]?.value ?? ''}${i.data[1]?.label ? '(' + i.data[1]?.label + ')' : ''}`).join('|') });
+                    const getLog = (i) => {
+                        let health = '';
+                        if (i.dataState === 'amber')
+                            health = '[A]';
+                        if (i.dataState === 'red')
+                            health = '[R]';
+                        return `${i.title}${health}:${i.data[0]?.value ?? ''}:${i.data[1]?.value ?? ''}${i.data[1]?.label ? '(' + i.data[1]?.label + ')' : ''}`;
+                    };
+                    this.logEvent({ message: 'Dashboard update', items: info.map(getLog).join('|') });
                 }
                 return info;
             }

package/lib/cjs/devices/ride/service.js

@@ -691,7 +691,7 @@ let DeviceRideService = (() => {
                 const tsLastData = this.getLastDataTS(ai);
                 const isPaused = ai.adapter.isPaused();
                 const prevStatus = ai.dataStatus;
-                if (isPaused || !tsLastData || ai.isRestarting) {
+                if (isPaused || !tsLastData) {
                     this.setLastDataTS(ai, tsNow);
                     ai.dataStatus = 'green';
                     return;
@@ -715,6 +715,7 @@ let DeviceRideService = (() => {
                 if (ai.dataStatus !== prevStatus) {
                     const { enabledCapabilities } = this.getEnabledCapabilities(ai);
                     this.emit('health', ai.udid, ai.dataStatus, enabledCapabilities);
+                    this.logEvent({ message: 'device health status changed', device: ai.adapter.getUniqueName(), udid: ai.udid, healthState: ai.dataStatus });
                 }
             };
             if (ai.ivToCheck) {
@@ -752,16 +753,22 @@ let DeviceRideService = (() => {
             }
         }
         async prepareReconnect(unhealthy) {
-            this.logEvent({ message: 'prepareReconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData, isRestarting: unhealthy.isRestarting });
+            const tsLastData = this.getLastDataTS(unhealthy);
+            const tsLastDataStr = new Date(tsLastData).toISOString();
+            const tsNow = Date.now();
+            this.logEvent({ message: 'prepareReconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (tsNow - tsLastData), tsLastData: tsLastDataStr, isRestarting: unhealthy.isRestarting });
             if (unhealthy.isRestarting) {
-                this.logEvent({ message: 'skipped reconnect - device already restarting', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
+                this.logEvent({ message: 'skipped reconnect - device already restarting', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (tsNow - tsLastData), tsLastData: tsLastDataStr });
                 return;
             }
             unhealthy.isRestarting = true;
+            unhealthy.isHealthy = false;
             const ifName = unhealthy.adapter.getInterface();
             const adapters = this.rideAdapters?.filter(ai => ai.adapter.getInterface() === ifName);
-            const stillHealthy = adapters.filter(ai => ai.isHealthy === undefined || ai.isHealthy);
-            this.logEvent({ message: 'reconnect confirmed', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData, stillHealthy: stillHealthy?.length, onSameInterface: adapters.length });
+            const stillHealthy = adapters.filter(ai => ai.isHealthy === undefined || ai.isHealthy === true);
+            this.logEvent({ message: 'reconnect confirmed', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid,
+                noDataSince: (tsNow - tsLastData),
+                tsLastData: tsLastDataStr, stillHealthy: stillHealthy?.length, onSameInterface: adapters.length });
             try {
                 if (!stillHealthy?.length && adapters.length > 1 && ifName !== 'ble') {
                     await this.reconnectInterface(ifName, adapters);
@@ -792,6 +799,13 @@ let DeviceRideService = (() => {
                 this.reconnectBusy = false;
                 return;
             }
+            const restarting = adapters.filter(ai => ai.isRestarting) ?? [];
+            if (restarting.length) {
+                this.logEvent({ message: 'interrupt restarts', interface: ifName });
+                for (const ai of restarting) {
+                    await this.stopDuringInterfaceRestart(ai);
+                }
+            }
             this.logEvent({ message: 'restart interface', interface: ifName });
             let stopRequested = false;
             this.once('stop-ride', () => { stopRequested = true; });
@@ -878,6 +892,7 @@ let DeviceRideService = (() => {
             catch (err) {
                 this.logError(err, 'stopDuringInterfaceRestart');
             }
+            unhealthy.isRestarting = false;
         }
         async reconnectSingle(unhealthy) {
             unhealthy.isRestarting = true;

package/lib/cjs/ride/display/service.js

@@ -191,7 +191,6 @@ let RideDisplayService = (() => {
             }
         }
         pause(requester = 'user') {
-            console.log('# PAUSE', requester);
             try {
                 if (this.state !== 'Active')
                     return;

package/lib/cjs/ride/route/GpxDisplayService.js

@@ -40,7 +40,7 @@ const apps_1 = require("../../apps");
 const decorators_1 = require("../../base/decorators");
 const types_1 = require("../../base/types");
 const routes_1 = require("../../routes");
-const settings_1 = require("../../settings");
+const display_1 = require("../../settings/display");
 const RouteDisplayService_1 = require("./RouteDisplayService");
 const SV_UPDATE_FREQ = 3000;
 const SV_MIN_READY = 1500;
@@ -48,18 +48,18 @@ const SV_MIN_DELAY = 1000;
 let GpxDisplayService = (() => {
     let _classSuper = RouteDisplayService_1.RouteDisplayService;
     let _instanceExtraInitializers = [];
-    let _getUserSettings_decorators;
     let _getGoogleMaps_decorators;
     let _getBindings_decorators;
+    let _getRideSettingsDisplay_decorators;
     return class GpxDisplayService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-            _getUserSettings_decorators = [decorators_1.Injectable];
             _getGoogleMaps_decorators = [decorators_1.Injectable];
             _getBindings_decorators = [decorators_1.Injectable];
-            __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            _getRideSettingsDisplay_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getGoogleMaps_decorators, { kind: "method", name: "getGoogleMaps", static: false, private: false, access: { has: obj => "getGoogleMaps" in obj, get: obj => obj.getGoogleMaps }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getRideSettingsDisplay_decorators, { kind: "method", name: "getRideSettingsDisplay", static: false, private: false, access: { has: obj => "getRideSettingsDisplay" in obj, get: obj => obj.getRideSettingsDisplay }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         mapLoaded = (__runInitializers(this, _instanceExtraInitializers), false);
@@ -78,7 +78,7 @@ let GpxDisplayService = (() => {
         }
         initView() {
             try {
-                const rideView = this.getRideView();
+                const rideView = this.getRideSettingsDisplay().getRideView();
                 if (rideView === 'sv') {
                     const updateFreq = this.getDefaultUpdateFrequency();
                     const minimalPause = this.getMinimalPause();
@@ -121,7 +121,7 @@ let GpxDisplayService = (() => {
             };
         }
         getStartOverlayProps() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'map' || this.isMobile()) {
                 return {
                     mapType: this.getRideViewName(),
@@ -135,7 +135,7 @@ let GpxDisplayService = (() => {
             };
         }
         isStartRideCompleted() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'map' || this.isMobile()) {
                 this.mapLoaded = true;
                 return true;
@@ -144,7 +144,7 @@ let GpxDisplayService = (() => {
         }
         getDisplayProperties(props) {
             let routeProps = super.getDisplayProperties(props);
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'sv') {
                 routeProps = { ...routeProps, ...this.getStreetViewProps(props) };
             }
@@ -160,13 +160,10 @@ let GpxDisplayService = (() => {
             };
         }
         getRideView() {
-            if (this.isMobile())
-                return 'sv';
-            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
-            return rideView;
+            return this.getRideSettingsDisplay().getRideView();
         }
         getRideViewName() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             const map = {
                 map: 'Map',
                 sv: 'Street View',
@@ -261,7 +258,7 @@ let GpxDisplayService = (() => {
         }
         onPositionUpdate(state) {
             const { route, position } = state ?? {};
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'sv') {
                 const sincePrev = Date.now() - (this.tsPrevSVUpdate ?? 0);
                 if (sincePrev > this.getStreetViewUpdateDelay() - 25) {
@@ -308,8 +305,8 @@ let GpxDisplayService = (() => {
         isMobile() {
             return this.getBindings().appInfo?.getChannel() === 'mobile';
         }
-        getUserSettings() {
-            return (0, settings_1.useUserSettings)();
+        isIOS() {
+            return this.getBindings().appInfo?.getOS().platform === 'ios';
         }
         getGoogleMaps() {
             return (0, apps_1.useGoogleMaps)();
@@ -317,6 +314,9 @@ let GpxDisplayService = (() => {
         getBindings() {
             return (0, api_1.getBindings)();
         }
+        getRideSettingsDisplay() {
+            return (0, display_1.useRideSettingsDisplay)();
+        }
     };
 })();
 exports.GpxDisplayService = GpxDisplayService;

package/lib/cjs/settings/display/ride/service.js

@@ -83,8 +83,10 @@ let RideSettingsDisplayService = (() => {
             };
         }
         setRideView(rideView) {
+            if (this.isRestricted())
+                return;
             try {
-                this.getUserSettings().get('preferences.rideView', rideView);
+                this.getUserSettings().set('preferences.rideView', rideView);
             }
             catch (err) {
                 this.logError(err, 'setRideView');
@@ -95,6 +97,8 @@ let RideSettingsDisplayService = (() => {
                 this.observer.emit('changed', this.getDisplayProps());
         }
         getRideView() {
+            if (this.isRestricted())
+                return 'map';
             if (this.isMobile() && !this.isAndroid())
                 return 'map';
             const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
@@ -102,6 +106,10 @@ let RideSettingsDisplayService = (() => {
         }
         getRideViewOptions() {
             const map = new Map();
+            if (this.isRestricted()) {
+                map.set('map', 'Map');
+                return map;
+            }
             if (!this.isIOS())
                 map.set('sv', 'Street View');
             map.set('map', 'Map');
@@ -109,6 +117,13 @@ let RideSettingsDisplayService = (() => {
                 map.set('sat', 'Satellite View');
             return map;
         }
+        isRestricted() {
+            if (this.isMobile()) {
+                const secretsStatus = this.getSecretBinding()?.getSecretsStatus?.();
+                return (secretsStatus === 'stale' || secretsStatus === 'missing' || secretsStatus === undefined);
+            }
+            return false;
+        }
         isMobile() {
             return this.getBindings().appInfo?.getChannel() === 'mobile';
         }
@@ -116,7 +131,7 @@ let RideSettingsDisplayService = (() => {
             return this.getBindings().appInfo?.getOS()?.platform === 'android';
         }
         isIOS() {
-            return this.getBindings().appInfo?.getOS()?.platform === 'darwin';
+            return this.getBindings().appInfo?.getOS()?.platform === 'ios';
         }
         getUserSettings() {
             return (0, service_2.useUserSettings)();
@@ -124,6 +139,9 @@ let RideSettingsDisplayService = (() => {
         getBindings() {
             return (0, api_1.getBindings)();
         }
+        getSecretBinding() {
+            return this.getBindings().secret;
+        }
     };
     return RideSettingsDisplayService = _classThis;
 })();

package/lib/esm/activities/ride/service.js

@@ -255,7 +255,15 @@ let ActivityRideService = (() => {
                 catch {
                 }
                 if (showLog) {
-                    this.logEvent({ message: 'Dashboard update', items: info.map(i => `${i.title}:${i.data[0]?.value ?? ''}:${i.data[1]?.value ?? ''}${i.data[1]?.label ? '(' + i.data[1]?.label + ')' : ''}`).join('|') });
+                    const getLog = (i) => {
+                        let health = '';
+                        if (i.dataState === 'amber')
+                            health = '[A]';
+                        if (i.dataState === 'red')
+                            health = '[R]';
+                        return `${i.title}${health}:${i.data[0]?.value ?? ''}:${i.data[1]?.value ?? ''}${i.data[1]?.label ? '(' + i.data[1]?.label + ')' : ''}`;
+                    };
+                    this.logEvent({ message: 'Dashboard update', items: info.map(getLog).join('|') });
                 }
                 return info;
             }

package/lib/esm/devices/ride/service.js

@@ -685,7 +685,7 @@ let DeviceRideService = (() => {
                 const tsLastData = this.getLastDataTS(ai);
                 const isPaused = ai.adapter.isPaused();
                 const prevStatus = ai.dataStatus;
-                if (isPaused || !tsLastData || ai.isRestarting) {
+                if (isPaused || !tsLastData) {
                     this.setLastDataTS(ai, tsNow);
                     ai.dataStatus = 'green';
                     return;
@@ -709,6 +709,7 @@ let DeviceRideService = (() => {
                 if (ai.dataStatus !== prevStatus) {
                     const { enabledCapabilities } = this.getEnabledCapabilities(ai);
                     this.emit('health', ai.udid, ai.dataStatus, enabledCapabilities);
+                    this.logEvent({ message: 'device health status changed', device: ai.adapter.getUniqueName(), udid: ai.udid, healthState: ai.dataStatus });
                 }
             };
             if (ai.ivToCheck) {
@@ -746,16 +747,22 @@ let DeviceRideService = (() => {
             }
         }
         async prepareReconnect(unhealthy) {
-            this.logEvent({ message: 'prepareReconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData, isRestarting: unhealthy.isRestarting });
+            const tsLastData = this.getLastDataTS(unhealthy);
+            const tsLastDataStr = new Date(tsLastData).toISOString();
+            const tsNow = Date.now();
+            this.logEvent({ message: 'prepareReconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (tsNow - tsLastData), tsLastData: tsLastDataStr, isRestarting: unhealthy.isRestarting });
             if (unhealthy.isRestarting) {
-                this.logEvent({ message: 'skipped reconnect - device already restarting', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
+                this.logEvent({ message: 'skipped reconnect - device already restarting', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (tsNow - tsLastData), tsLastData: tsLastDataStr });
                 return;
             }
             unhealthy.isRestarting = true;
+            unhealthy.isHealthy = false;
             const ifName = unhealthy.adapter.getInterface();
             const adapters = this.rideAdapters?.filter(ai => ai.adapter.getInterface() === ifName);
-            const stillHealthy = adapters.filter(ai => ai.isHealthy === undefined || ai.isHealthy);
-            this.logEvent({ message: 'reconnect confirmed', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData, stillHealthy: stillHealthy?.length, onSameInterface: adapters.length });
+            const stillHealthy = adapters.filter(ai => ai.isHealthy === undefined || ai.isHealthy === true);
+            this.logEvent({ message: 'reconnect confirmed', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid,
+                noDataSince: (tsNow - tsLastData),
+                tsLastData: tsLastDataStr, stillHealthy: stillHealthy?.length, onSameInterface: adapters.length });
             try {
                 if (!stillHealthy?.length && adapters.length > 1 && ifName !== 'ble') {
                     await this.reconnectInterface(ifName, adapters);
@@ -786,6 +793,13 @@ let DeviceRideService = (() => {
                 this.reconnectBusy = false;
                 return;
             }
+            const restarting = adapters.filter(ai => ai.isRestarting) ?? [];
+            if (restarting.length) {
+                this.logEvent({ message: 'interrupt restarts', interface: ifName });
+                for (const ai of restarting) {
+                    await this.stopDuringInterfaceRestart(ai);
+                }
+            }
             this.logEvent({ message: 'restart interface', interface: ifName });
             let stopRequested = false;
             this.once('stop-ride', () => { stopRequested = true; });
@@ -872,6 +886,7 @@ let DeviceRideService = (() => {
             catch (err) {
                 this.logError(err, 'stopDuringInterfaceRestart');
             }
+            unhealthy.isRestarting = false;
         }
         async reconnectSingle(unhealthy) {
             unhealthy.isRestarting = true;

package/lib/esm/ride/display/service.js

@@ -188,7 +188,6 @@ let RideDisplayService = (() => {
             }
         }
         pause(requester = 'user') {
-            console.log('# PAUSE', requester);
             try {
                 if (this.state !== 'Active')
                     return;

package/lib/esm/ride/route/GpxDisplayService.js

@@ -37,7 +37,7 @@ import { useGoogleMaps } from "../../apps";
 import { Injectable } from "../../base/decorators";
 import { Observer } from "../../base/types";
 import { getHeading } from "../../routes";
-import { useUserSettings } from "../../settings";
+import { useRideSettingsDisplay } from "../../settings/display";
 import { RouteDisplayService } from "./RouteDisplayService";
 const SV_UPDATE_FREQ = 3000;
 const SV_MIN_READY = 1500;
@@ -45,18 +45,18 @@ const SV_MIN_DELAY = 1000;
 let GpxDisplayService = (() => {
     let _classSuper = RouteDisplayService;
     let _instanceExtraInitializers = [];
-    let _getUserSettings_decorators;
     let _getGoogleMaps_decorators;
     let _getBindings_decorators;
+    let _getRideSettingsDisplay_decorators;
     return class GpxDisplayService extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-            _getUserSettings_decorators = [Injectable];
             _getGoogleMaps_decorators = [Injectable];
             _getBindings_decorators = [Injectable];
-            __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            _getRideSettingsDisplay_decorators = [Injectable];
             __esDecorate(this, null, _getGoogleMaps_decorators, { kind: "method", name: "getGoogleMaps", static: false, private: false, access: { has: obj => "getGoogleMaps" in obj, get: obj => obj.getGoogleMaps }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getRideSettingsDisplay_decorators, { kind: "method", name: "getRideSettingsDisplay", static: false, private: false, access: { has: obj => "getRideSettingsDisplay" in obj, get: obj => obj.getRideSettingsDisplay }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         mapLoaded = (__runInitializers(this, _instanceExtraInitializers), false);
@@ -75,7 +75,7 @@ let GpxDisplayService = (() => {
         }
         initView() {
             try {
-                const rideView = this.getRideView();
+                const rideView = this.getRideSettingsDisplay().getRideView();
                 if (rideView === 'sv') {
                     const updateFreq = this.getDefaultUpdateFrequency();
                     const minimalPause = this.getMinimalPause();
@@ -118,7 +118,7 @@ let GpxDisplayService = (() => {
             };
         }
         getStartOverlayProps() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'map' || this.isMobile()) {
                 return {
                     mapType: this.getRideViewName(),
@@ -132,7 +132,7 @@ let GpxDisplayService = (() => {
             };
         }
         isStartRideCompleted() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'map' || this.isMobile()) {
                 this.mapLoaded = true;
                 return true;
@@ -141,7 +141,7 @@ let GpxDisplayService = (() => {
         }
         getDisplayProperties(props) {
             let routeProps = super.getDisplayProperties(props);
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'sv') {
                 routeProps = { ...routeProps, ...this.getStreetViewProps(props) };
             }
@@ -157,13 +157,10 @@ let GpxDisplayService = (() => {
             };
         }
         getRideView() {
-            if (this.isMobile())
-                return 'sv';
-            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
-            return rideView;
+            return this.getRideSettingsDisplay().getRideView();
         }
         getRideViewName() {
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             const map = {
                 map: 'Map',
                 sv: 'Street View',
@@ -258,7 +255,7 @@ let GpxDisplayService = (() => {
         }
         onPositionUpdate(state) {
             const { route, position } = state ?? {};
-            const rideView = this.getRideView();
+            const rideView = this.getRideSettingsDisplay().getRideView();
             if (rideView === 'sv') {
                 const sincePrev = Date.now() - (this.tsPrevSVUpdate ?? 0);
                 if (sincePrev > this.getStreetViewUpdateDelay() - 25) {
@@ -305,8 +302,8 @@ let GpxDisplayService = (() => {
         isMobile() {
             return this.getBindings().appInfo?.getChannel() === 'mobile';
         }
-        getUserSettings() {
-            return useUserSettings();
+        isIOS() {
+            return this.getBindings().appInfo?.getOS().platform === 'ios';
         }
         getGoogleMaps() {
             return useGoogleMaps();
@@ -314,6 +311,9 @@ let GpxDisplayService = (() => {
         getBindings() {
             return getBindings();
         }
+        getRideSettingsDisplay() {
+            return useRideSettingsDisplay();
+        }
     };
 })();
 export { GpxDisplayService };

package/lib/esm/settings/display/ride/service.js

@@ -80,8 +80,10 @@ let RideSettingsDisplayService = (() => {
             };
         }
         setRideView(rideView) {
+            if (this.isRestricted())
+                return;
             try {
-                this.getUserSettings().get('preferences.rideView', rideView);
+                this.getUserSettings().set('preferences.rideView', rideView);
             }
             catch (err) {
                 this.logError(err, 'setRideView');
@@ -92,6 +94,8 @@ let RideSettingsDisplayService = (() => {
                 this.observer.emit('changed', this.getDisplayProps());
         }
         getRideView() {
+            if (this.isRestricted())
+                return 'map';
             if (this.isMobile() && !this.isAndroid())
                 return 'map';
             const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
@@ -99,6 +103,10 @@ let RideSettingsDisplayService = (() => {
         }
         getRideViewOptions() {
             const map = new Map();
+            if (this.isRestricted()) {
+                map.set('map', 'Map');
+                return map;
+            }
             if (!this.isIOS())
                 map.set('sv', 'Street View');
             map.set('map', 'Map');
@@ -106,6 +114,13 @@ let RideSettingsDisplayService = (() => {
                 map.set('sat', 'Satellite View');
             return map;
         }
+        isRestricted() {
+            if (this.isMobile()) {
+                const secretsStatus = this.getSecretBinding()?.getSecretsStatus?.();
+                return (secretsStatus === 'stale' || secretsStatus === 'missing' || secretsStatus === undefined);
+            }
+            return false;
+        }
         isMobile() {
             return this.getBindings().appInfo?.getChannel() === 'mobile';
         }
@@ -113,7 +128,7 @@ let RideSettingsDisplayService = (() => {
             return this.getBindings().appInfo?.getOS()?.platform === 'android';
         }
         isIOS() {
-            return this.getBindings().appInfo?.getOS()?.platform === 'darwin';
+            return this.getBindings().appInfo?.getOS()?.platform === 'ios';
         }
         getUserSettings() {
             return useUserSettings();
@@ -121,6 +136,9 @@ let RideSettingsDisplayService = (() => {
         getBindings() {
             return getBindings();
         }
+        getSecretBinding() {
+            return this.getBindings().secret;
+        }
     };
     return RideSettingsDisplayService = _classThis;
 })();

package/lib/types/ride/route/GpxDisplayService.d.ts

@@ -1,7 +1,6 @@
 import { GoogleMapsService } from "../../apps";
 import { Observer } from "../../base/types";
 import { Route } from "../../routes/base/model/route";
-import { UserSettingsService } from "../../settings";
 import { RoutePoint } from "../../types";
 import { CurrentRideDisplayProps, GpxDisplayProps } from "../base";
 import { RouteDisplayService } from "./RouteDisplayService";
@@ -45,7 +44,7 @@ export declare class GpxDisplayService extends RouteDisplayService {
     };
     isStartRideCompleted(): boolean;
     getDisplayProperties(props: CurrentRideDisplayProps): GpxDisplayProps;
-    protected getRideView(): string;
+    protected getRideView(): import("../../types").TRideView;
     protected getRideViewName(): string;
     protected onSatelliteViewEvent(state: SatelliteViewEvent, error?: string): void;
     protected onMapViewEvent(state: SatelliteViewEvent, _error?: string): void;
@@ -61,7 +60,8 @@ export declare class GpxDisplayService extends RouteDisplayService {
     protected getBestCaseUpdateFrequency(): number;
     protected getNumSetting(key: string): number | undefined;
     protected isMobile(): boolean;
-    protected getUserSettings(): UserSettingsService;
+    protected isIOS(): boolean;
     protected getGoogleMaps(): GoogleMapsService;
     protected getBindings(): import("../../api").IncyclistBindings;
+    protected getRideSettingsDisplay(): import("../../settings/display").RideSettingsDisplayService;
 }

package/lib/types/settings/display/ride/service.d.ts

@@ -1,3 +1,4 @@
+import { ISecretBinding } from "../../../api";
 import { IncyclistService } from "../../../base/service";
 import { Observer } from "../../../base/types";
 import { IObserver } from "../../../types";
@@ -11,12 +12,14 @@ export declare class RideSettingsDisplayService extends IncyclistService {
     getDisplayProps(): RideSettingsDisplayProps;
     setRideView(rideView: TRideView): void;
     protected emitChanged(): void;
-    protected getRideView(): TRideView;
-    protected getRideViewOptions(): Map<TRideView, string>;
+    getRideView(): TRideView;
+    getRideViewOptions(): Map<TRideView, string>;
+    protected isRestricted(): boolean;
     protected isMobile(): boolean;
     protected isAndroid(): boolean;
     protected isIOS(): boolean;
     protected getUserSettings(): UserSettingsService;
     protected getBindings(): import("../../../api").IncyclistBindings;
+    protected getSecretBinding(): ISecretBinding | undefined;
 }
 export declare const useRideSettingsDisplay: () => RideSettingsDisplayService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.69",
+  "version": "1.7.71",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },