fix: use existing positionStore state as tracking permission

Permission api seems to return unknown permission in some devices
even when the user has already activated use of own location.
Use positionStore to access existing geolocation state.

Author: vesameskanen

app/component/itinerary/navigator/NaviContainer.js

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, { useEffect, useState } from 'react';
 import polyUtil from 'polyline-encoded';
 import { legTime } from '../../../util/legUtils';
+import { checkPositioningPermission } from '../../../action/PositionActions';
 import { GeodeticToEcef, GeodeticToEnu } from '../../../util/geo-utils';
 import { itineraryShape, relayShape } from '../../../util/shapes';
 import NaviBottom from './NaviBottom';
@@ -21,6 +22,7 @@ function NaviContainer(
 ) {
   const [planarLegs, setPlanarLegs] = useState([]);
   const [origin, setOrigin] = useState();
+  const [isPositioningAllowed, setPositioningAllowed] = useState(false);
 
   const position = getStore('PositionStore').getLocationState();
 
@@ -38,7 +40,21 @@ function NaviContainer(
     setOrigin(orig);
   }, [itinerary]);
 
-  const { realTimeLegs, time, isPositioningAllowed } = useRealtimeLegs(
+  useEffect(async () => {
+    let permissionGranted;
+    if (position.hasLocation) {
+      permissionGranted = true;
+    } else {
+      const permission = await checkPositioningPermission();
+      permissionGranted = permission.state === 'granted';
+    }
+    if (permissionGranted) {
+      mapRef?.enableMapTracking();
+    }
+    setPositioningAllowed(permissionGranted);
+  }, [mapRef]);
+
+  const { realTimeLegs, time } = useRealtimeLegs(
     planarLegs,
     mapRef,
     relayEnvironment,

app/component/itinerary/navigator/hooks/useRealtimeLegs.js

@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
 import { fetchQuery } from 'react-relay';
-import { checkPositioningPermission } from '../../../../action/PositionActions';
 import { legQuery } from '../../queries/LegQuery';
 import { legTime } from '../../../../util/legUtils';
 import { epochToIso } from '../../../../util/timeUtils';
@@ -87,19 +86,9 @@ function matchLegEnds(legs) {
 }
 
 const useRealtimeLegs = (initialLegs, mapRef, relayEnvironment) => {
-  const [isPositioningAllowed, setPositioningAllowed] = useState(false);
   const [realTimeLegs, setRealTimeLegs] = useState(initialLegs);
   const [time, setTime] = useState(Date.now());
 
-  const enableMapTracking = useCallback(async () => {
-    const permission = await checkPositioningPermission();
-    const isPermissionGranted = permission.state === 'granted' || true;
-    if (isPermissionGranted) {
-      mapRef?.enableMapTracking();
-    }
-    setPositioningAllowed(isPermissionGranted);
-  }, [mapRef]);
-
   const queryAndMapRealtimeLegs = useCallback(
     async legs => {
       if (!legs.length) {
@@ -151,17 +140,16 @@ const useRealtimeLegs = (initialLegs, mapRef, relayEnvironment) => {
   }, [initialLegs, queryAndMapRealtimeLegs]);
 
   useEffect(() => {
-    enableMapTracking();
     fetchAndSetRealtimeLegs();
     const interval = setInterval(() => {
       fetchAndSetRealtimeLegs();
       setTime(Date.now());
     }, 10000);
 
     return () => clearInterval(interval);
-  }, [enableMapTracking, fetchAndSetRealtimeLegs]);
+  }, [fetchAndSetRealtimeLegs]);
 
-  return { realTimeLegs, time, isPositioningAllowed };
+  return { realTimeLegs, time };
 };
 
 export { useRealtimeLegs };