@os1-platform/dispatch-mobile 3.0.0 → 3.0.1

package/lib/module/utils/SdkUtils.js

@@ -6,6 +6,7 @@ import * as Location from 'expo-location';
 import NetworkUtil from './NetworkUtil';
 import { BaseError } from '../errors/BaseError';
 import ErrorCodes from '../errors/ErrorCodes';
+import PermissionModule from '../native/PermissionModule';
 const {
   DispatchSdkUtils
 } = NativeModules;
@@ -79,8 +80,13 @@ export default class SdkUtils {
     });
   }
   static async checkMandatory() {
-    if (Platform.OS === 'ios') return;
-    // if (Platform.OS === 'ios') return true;
+    if (Platform.OS === 'ios') {
+      const foregroundLocation = await PermissionModule.requestForegroundPermissions();
+      if (!foregroundLocation) {
+        throw new BaseError(ErrorCodes.LOCATION_OR_GPS_NOT_ENABLED, 'Location or GPS not enabled');
+      }
+      return;
+    }
     const dateTimeCheck = await DispatchSdkUtils.isAutomaticDateTimeEnabled();
     if (!dateTimeCheck) {
       throw new BaseError(ErrorCodes.SYSTEM_TIME_CHECK_FAILED, 'Automatic date/time not enabled!');
@@ -88,8 +94,10 @@ export default class SdkUtils {
     if (Platform.OS === 'android') {
       await Location.enableNetworkProviderAsync();
       let locationServicesCheck = await Location.hasServicesEnabledAsync();
-      const foregroundLocation = await Location.requestForegroundPermissionsAsync();
-      const bgLocation = await Location.requestBackgroundPermissionsAsync();
+      const foregroundLocation = await PermissionModule.requestForegroundPermissions();
+      // await Location.requestForegroundPermissionsAsync(); //permission code using expo module
+      const bgLocation = await PermissionModule.requestBackgroundPermissions();
+      // await Location.requestBackgroundPermissionsAsync(); //permission code using expo module
       if (!(locationServicesCheck && foregroundLocation && bgLocation)) {
         throw new BaseError(ErrorCodes.LOCATION_OR_GPS_NOT_ENABLED, 'Location or GPS not enabled');
       }

package/lib/module/utils/SdkUtils.js.map

@@ -1 +1 @@
-{"version":3,"names":["remoteConfig","Logger","LOG_TYPE","FileSystem","NativeModules","Platform","Location","NetworkUtil","BaseError","ErrorCodes","DispatchSdkUtils","DispatchUtilsInterface","SdkUtils","getRemoteConfig","expiration","Promise","resolve","reject","fetch","setDefaults","cxRumDevApiKey","cxRumProdApiKey","isMandatoryUpdate","isMandatoryUpdateiOS","toggleInAppUpdateiOS","toggleInAppUpdate","then","fetchAndActivate","fetchedRemotely","config","getAll","getInstance","logEvent","SDK_INFO","catch","err","error","downloadAPK","apkURL","version","callback","fileUri","cacheDirectory","fileInfo","getInfoAsync","currentDate","Date","toLocaleDateString","fileDate","modificationTime","exists","uri","downloadResumable","createDownloadResumable","downloadResult","downloadAsync","deleteApk","deleteAsync","openAPKFile","openAndInstallApk","openAppSettings","openSettings","message","SDK_ERROR","checkMandatory","OS","dateTimeCheck","isAutomaticDateTimeEnabled","SYSTEM_TIME_CHECK_FAILED","enableNetworkProviderAsync","locationServicesCheck","hasServicesEnabledAsync","foregroundLocation","requestForegroundPermissionsAsync","bgLocation","requestBackgroundPermissionsAsync","LOCATION_OR_GPS_NOT_ENABLED","internet","isAvailableAsync","INTERNET_NOT_ENABLED"],"sources":["SdkUtils.ts"],"sourcesContent":["import remoteConfig from '@react-native-firebase/remote-config';\nimport Logger, { LOG_TYPE } from './Logger';\nimport type { DownloadProgressData } from 'expo-file-system';\nimport * as FileSystem from 'expo-file-system';\nimport { NativeModules, Platform } from 'react-native';\nimport * as Location from 'expo-location';\nimport NetworkUtil from './NetworkUtil';\nimport { BaseError } from '../errors/BaseError';\nimport ErrorCodes from '../errors/ErrorCodes';\n\nconst { DispatchSdkUtils } = NativeModules;\n\ninterface DispatchUtilsInterface {\n  openAndInstallApk(apkUri: String): Promise<boolean>;\n  openSettings(): Promise<boolean>;\n  showAndroidDialog(\n    title: string,\n    message: string,\n    positiveText: string,\n    negativeText: string | null,\n    cancelable: boolean\n  ): Promise<boolean>;\n  isAutomaticDateTimeEnabled(): Promise<boolean>;\n}\n\nexport { DispatchSdkUtils as DispatchUtilsInterface };\n\nexport default class SdkUtils {\n  /**\n   * number of seconds to cache the firebase config\n   * @param expiration\n   */\n  static async getRemoteConfig(expiration: number): Promise<any> {\n    return new Promise(async (resolve, reject) => {\n      try {\n        await remoteConfig().fetch(expiration);\n        remoteConfig()\n          .setDefaults({\n            cxRumDevApiKey: 'NA',\n            cxRumProdApiKey: 'NA',\n            isMandatoryUpdate: 'false',\n            isMandatoryUpdateiOS: 'false',\n            toggleInAppUpdateiOS: 'false',\n            toggleInAppUpdate: 'false',\n          })\n          .then(() => remoteConfig().fetchAndActivate())\n          .then((fetchedRemotely) => {\n            let config = remoteConfig().getAll();\n            if (fetchedRemotely) {\n              Logger.getInstance().logEvent(\n                'Remote Config',\n                'Configs were retrieved from the backend and activated.',\n                LOG_TYPE.SDK_INFO\n              );\n              resolve(config);\n            } else {\n              Logger.getInstance().logEvent(\n                'Remote Config',\n                'No configs were fetched from the backend, and the local configs were already activated',\n                LOG_TYPE.SDK_INFO\n              );\n              resolve(config);\n            }\n          })\n          .catch((err) => {\n            reject(err);\n          });\n      } catch (error: any) {\n        reject(error);\n      }\n    });\n  }\n\n  /**\n   * Function to download apk file from a public URL\n   * @param apkURL - URL where apk is hosted\n   * @param version - expected version of apk (used for naming the file)\n   * @param callback - callback for getting progress of download\n   */\n  public static async downloadAPK(\n    apkURL: string,\n    version: string,\n    callback: (progress: DownloadProgressData) => any\n  ): Promise<string | undefined> {\n    const fileUri = FileSystem.cacheDirectory + `${version}.apk`;\n    const fileInfo = await FileSystem.getInfoAsync(fileUri);\n    const currentDate = new Date().toLocaleDateString();\n    const fileDate = new Date(\n      fileInfo.modificationTime ? fileInfo.modificationTime * 1000 : 0\n    ).toLocaleDateString();\n    if (fileInfo.exists && currentDate === fileDate) {\n      return fileInfo.uri;\n    }\n    const downloadResumable = FileSystem.createDownloadResumable(\n      apkURL,\n      FileSystem.cacheDirectory + `${version}.apk`,\n      {},\n      callback\n    );\n    const downloadResult = await downloadResumable.downloadAsync();\n    return downloadResult?.uri;\n  }\n\n  /**\n   * Opens & Install an APK file\n   * @param uri - source of apk file\n   */\n  public static async deleteApk(version: string) {\n    await FileSystem.deleteAsync(FileSystem.cacheDirectory + `${version}.apk`);\n  }\n\n  public static async openAPKFile(uri: string) {\n    return await (DispatchSdkUtils as DispatchUtilsInterface).openAndInstallApk(\n      uri\n    );\n  }\n\n  public static openAppSettings() {\n    (DispatchSdkUtils as DispatchUtilsInterface)\n      .openSettings()\n      .then()\n      .catch((error) => {\n        Logger.getInstance().logEvent(\n          'Intent error',\n          error.message,\n          LOG_TYPE.SDK_ERROR\n        );\n      });\n  }\n\n  public static async checkMandatory() {\n    if (Platform.OS === 'ios') return;\n    // if (Platform.OS === 'ios') return true;\n    const dateTimeCheck = await (\n      DispatchSdkUtils as DispatchUtilsInterface\n    ).isAutomaticDateTimeEnabled();\n    if (!dateTimeCheck) {\n      throw new BaseError(\n        ErrorCodes.SYSTEM_TIME_CHECK_FAILED,\n        'Automatic date/time not enabled!'\n      );\n    }\n    if (Platform.OS === 'android') {\n      await Location.enableNetworkProviderAsync();\n      let locationServicesCheck = await Location.hasServicesEnabledAsync();\n      const foregroundLocation =\n        await Location.requestForegroundPermissionsAsync();\n      const bgLocation = await Location.requestBackgroundPermissionsAsync();\n      if (!(locationServicesCheck && foregroundLocation && bgLocation)) {\n        throw new BaseError(\n          ErrorCodes.LOCATION_OR_GPS_NOT_ENABLED,\n          'Location or GPS not enabled'\n        );\n      }\n    }\n    let internet = await NetworkUtil.isAvailableAsync();\n    if (!internet)\n      throw new BaseError(\n        ErrorCodes.INTERNET_NOT_ENABLED,\n        'Internet is disabled! Please enable internet and try again '\n      );\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["remoteConfig","Logger","LOG_TYPE","FileSystem","NativeModules","Platform","Location","NetworkUtil","BaseError","ErrorCodes","PermissionModule","DispatchSdkUtils","DispatchUtilsInterface","SdkUtils","getRemoteConfig","expiration","Promise","resolve","reject","fetch","setDefaults","cxRumDevApiKey","cxRumProdApiKey","isMandatoryUpdate","isMandatoryUpdateiOS","toggleInAppUpdateiOS","toggleInAppUpdate","then","fetchAndActivate","fetchedRemotely","config","getAll","getInstance","logEvent","SDK_INFO","catch","err","error","downloadAPK","apkURL","version","callback","fileUri","cacheDirectory","fileInfo","getInfoAsync","currentDate","Date","toLocaleDateString","fileDate","modificationTime","exists","uri","downloadResumable","createDownloadResumable","downloadResult","downloadAsync","deleteApk","deleteAsync","openAPKFile","openAndInstallApk","openAppSettings","openSettings","message","SDK_ERROR","checkMandatory","OS","foregroundLocation","requestForegroundPermissions","LOCATION_OR_GPS_NOT_ENABLED","dateTimeCheck","isAutomaticDateTimeEnabled","SYSTEM_TIME_CHECK_FAILED","enableNetworkProviderAsync","locationServicesCheck","hasServicesEnabledAsync","bgLocation","requestBackgroundPermissions","internet","isAvailableAsync","INTERNET_NOT_ENABLED"],"sources":["SdkUtils.ts"],"sourcesContent":["import remoteConfig from '@react-native-firebase/remote-config';\nimport Logger, { LOG_TYPE } from './Logger';\nimport type { DownloadProgressData } from 'expo-file-system';\nimport * as FileSystem from 'expo-file-system';\nimport { NativeModules, Platform } from 'react-native';\nimport * as Location from 'expo-location';\nimport NetworkUtil from './NetworkUtil';\nimport { BaseError } from '../errors/BaseError';\nimport ErrorCodes from '../errors/ErrorCodes';\nimport PermissionModule from '../native/PermissionModule';\n\nconst { DispatchSdkUtils } = NativeModules;\n\ninterface DispatchUtilsInterface {\n  openAndInstallApk(apkUri: String): Promise<boolean>;\n  openSettings(): Promise<boolean>;\n  showAndroidDialog(\n    title: string,\n    message: string,\n    positiveText: string,\n    negativeText: string | null,\n    cancelable: boolean\n  ): Promise<boolean>;\n  isAutomaticDateTimeEnabled(): Promise<boolean>;\n}\n\nexport { DispatchSdkUtils as DispatchUtilsInterface };\n\nexport default class SdkUtils {\n  /**\n   * number of seconds to cache the firebase config\n   * @param expiration\n   */\n  static async getRemoteConfig(expiration: number): Promise<any> {\n    return new Promise(async (resolve, reject) => {\n      try {\n        await remoteConfig().fetch(expiration);\n        remoteConfig()\n          .setDefaults({\n            cxRumDevApiKey: 'NA',\n            cxRumProdApiKey: 'NA',\n            isMandatoryUpdate: 'false',\n            isMandatoryUpdateiOS: 'false',\n            toggleInAppUpdateiOS: 'false',\n            toggleInAppUpdate: 'false',\n          })\n          .then(() => remoteConfig().fetchAndActivate())\n          .then((fetchedRemotely) => {\n            let config = remoteConfig().getAll();\n            if (fetchedRemotely) {\n              Logger.getInstance().logEvent(\n                'Remote Config',\n                'Configs were retrieved from the backend and activated.',\n                LOG_TYPE.SDK_INFO\n              );\n              resolve(config);\n            } else {\n              Logger.getInstance().logEvent(\n                'Remote Config',\n                'No configs were fetched from the backend, and the local configs were already activated',\n                LOG_TYPE.SDK_INFO\n              );\n              resolve(config);\n            }\n          })\n          .catch((err) => {\n            reject(err);\n          });\n      } catch (error: any) {\n        reject(error);\n      }\n    });\n  }\n\n  /**\n   * Function to download apk file from a public URL\n   * @param apkURL - URL where apk is hosted\n   * @param version - expected version of apk (used for naming the file)\n   * @param callback - callback for getting progress of download\n   */\n  public static async downloadAPK(\n    apkURL: string,\n    version: string,\n    callback: (progress: DownloadProgressData) => any\n  ): Promise<string | undefined> {\n    const fileUri = FileSystem.cacheDirectory + `${version}.apk`;\n    const fileInfo = await FileSystem.getInfoAsync(fileUri);\n    const currentDate = new Date().toLocaleDateString();\n    const fileDate = new Date(\n      fileInfo.modificationTime ? fileInfo.modificationTime * 1000 : 0\n    ).toLocaleDateString();\n    if (fileInfo.exists && currentDate === fileDate) {\n      return fileInfo.uri;\n    }\n    const downloadResumable = FileSystem.createDownloadResumable(\n      apkURL,\n      FileSystem.cacheDirectory + `${version}.apk`,\n      {},\n      callback\n    );\n    const downloadResult = await downloadResumable.downloadAsync();\n    return downloadResult?.uri;\n  }\n\n  /**\n   * Opens & Install an APK file\n   * @param uri - source of apk file\n   */\n  public static async deleteApk(version: string) {\n    await FileSystem.deleteAsync(FileSystem.cacheDirectory + `${version}.apk`);\n  }\n\n  public static async openAPKFile(uri: string) {\n    return await (DispatchSdkUtils as DispatchUtilsInterface).openAndInstallApk(\n      uri\n    );\n  }\n\n  public static openAppSettings() {\n    (DispatchSdkUtils as DispatchUtilsInterface)\n      .openSettings()\n      .then()\n      .catch((error) => {\n        Logger.getInstance().logEvent(\n          'Intent error',\n          error.message,\n          LOG_TYPE.SDK_ERROR\n        );\n      });\n  }\n\n  public static async checkMandatory() {\n    if (Platform.OS === 'ios'){\n      const foregroundLocation = await PermissionModule.requestForegroundPermissions();\n      if (!(foregroundLocation)) {\n        throw new BaseError(\n          ErrorCodes.LOCATION_OR_GPS_NOT_ENABLED,\n          'Location or GPS not enabled'\n        );\n      }\n      return;\n    }\n    const dateTimeCheck = await (\n      DispatchSdkUtils as DispatchUtilsInterface\n    ).isAutomaticDateTimeEnabled();\n    if (!dateTimeCheck) {\n      throw new BaseError(\n        ErrorCodes.SYSTEM_TIME_CHECK_FAILED,\n        'Automatic date/time not enabled!'\n      );\n    }\n    if (Platform.OS === 'android') {\n      await Location.enableNetworkProviderAsync();\n      let locationServicesCheck = await Location.hasServicesEnabledAsync();\n      const foregroundLocation = await PermissionModule.requestForegroundPermissions();\n      // await Location.requestForegroundPermissionsAsync(); //permission code using expo module\n      const bgLocation = await PermissionModule.requestBackgroundPermissions();\n      // await Location.requestBackgroundPermissionsAsync(); //permission code using expo module\n      if (!(locationServicesCheck && foregroundLocation && bgLocation)) {\n        throw new BaseError(\n          ErrorCodes.LOCATION_OR_GPS_NOT_ENABLED,\n          'Location or GPS not enabled'\n        );\n      }\n    }\n    let internet = await NetworkUtil.isAvailableAsync();\n    if (!internet)\n      throw new BaseError(\n        ErrorCodes.INTERNET_NOT_ENABLED,\n        'Internet is disabled! Please enable internet and try again '\n      );\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/typescript/manager/location/LocationManager.d.ts

@@ -1,11 +1,13 @@
 export default class LocationManager {
     private static instance;
-    private lastLocation;
+    private lastLocationAndroid;
+    private lastLocationiOS;
     private stopUpdate;
+    private subscription;
     checkForLocationPermissions(): Promise<boolean>;
     static getInstance(): LocationManager;
     startUpdates(): void;
-    getLastLocation(): DLocation;
+    getLastLocation(): Promise<DLocation>;
     stopLocationUpdates(): void;
 }
 export interface DLocation {

package/lib/typescript/native/LocationModule.d.ts

@@ -0,0 +1,14 @@
+import { EmitterSubscription } from 'react-native';
+export interface LocationType {
+    latitude: number;
+    longitude: number;
+    accuracy: number;
+}
+declare const _default: {
+    startLocationUpdates: () => Promise<void>;
+    stopLocationUpdates: () => Promise<void>;
+    addLocationListener: (callback: (location: LocationType) => void) => EmitterSubscription;
+    removeLocationListener: (subscription: EmitterSubscription) => void;
+    getLastLocation: () => Promise<any>;
+};
+export default _default;

package/lib/typescript/native/PermissionModule.d.ts

@@ -0,0 +1,6 @@
+interface PermissionsModuleType {
+    requestForegroundPermissions: () => Promise<boolean>;
+    requestBackgroundPermissions: () => Promise<boolean>;
+}
+declare const _default: PermissionsModuleType;
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@os1-platform/dispatch-mobile",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Dispatch SDK React Native Package",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -50,7 +50,7 @@
   "license": "MIT",
   "author": "Amit Sanvedi <amit.sanvedi@delhivery.com> (https://github.com/FoxtrotPlatform/platform-coreos-dispatch-sdk)",
   "homepage": "https://github.com/FoxtrotPlatform/platform-coreos-dispatch-sdk/#readme",
-  "devDependencies": {    
+  "devDependencies": {
     "@apollo/client": "^3.5.6",
     "@babel/core": "^7.12.9",
     "@babel/preset-env": "^7.15.8",
@@ -256,7 +256,7 @@
       ]
     ]
   },
-  "dependencies": {    
+  "dependencies": {
     "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.17",
     "@rjsf/core": "^2.0.0",
     "apollo-link-timeout": "^4.0.0",
@@ -275,4 +275,4 @@
     "rjsf-native": "^1.0.14",
     "toggle-switch-react-native": "^3.3.0"
   }
-}
+}

package/src/components/executiontasks/doodle/SignatureET.tsx

@@ -143,10 +143,12 @@ lineHeight: 24 }}>{props.title}</Text>
           )) ?? 'NULL';
         const dateTime = await callbackHandler.getDateTime();
         console.log('saveAndSubmit:dateTime: ', dateTime);
-
-        let lat = LocationManager.getInstance().getLastLocation().latitude;
-        let lng = LocationManager.getInstance().getLastLocation().longitude;
-        let accuracy = LocationManager.getInstance().getLastLocation().accuracy;
+        let lastLocation = await LocationManager.getInstance().getLastLocation();
+        console.log("signatureET:lastLocation:",JSON.stringify(lastLocation));
+  
+        let lat = lastLocation.latitude;
+        let lng = lastLocation.longitude;
+        let accuracy = lastLocation.accuracy;
 
         let insertID = await insertDocumentInDB(
           fileName,

package/src/components/executiontasks/imageCapture/ImageCapture.tsx

@@ -304,6 +304,9 @@ const ImageCapture = (props: any) => {
       imgArray = imagesDummy;
       const dateTime = await callbackHandler.getDateTime();
       console.log('captureImage:dateTime: ', dateTime);
+       let lastLocation = await LocationManager.getInstance().getLastLocation();
+       console.log("captureImage:lastLocation:",JSON.stringify(lastLocation));
+
       imgArray[index] = {
         id: CaptureUtils.getImagesFileName(),
         // @ts-ignore
@@ -311,9 +314,9 @@ const ImageCapture = (props: any) => {
         url: '',
         timestamp: Date.now(),
         dateTime: dateTime,
-        lat: LocationManager.getInstance().getLastLocation().latitude,
-        lng: LocationManager.getInstance().getLastLocation().longitude,
-        accuracy: LocationManager.getInstance().getLastLocation().accuracy,
+        lat: lastLocation.latitude,
+        lng: lastLocation.longitude,
+        accuracy: lastLocation.accuracy,
       };
       setImagesDummy([...imgArray])
       console.log("images211:", JSON.stringify(imgArray));

package/src/manager/location/LocationManager.ts

@@ -1,20 +1,37 @@
 import * as Location from 'expo-location';
 import { Accuracy, LocationObject } from 'expo-location';
 import Logger, { LOG_TYPE } from '../../utils/Logger';
+import { EmitterSubscription, Platform } from 'react-native';
+import PermissionModule from '../../native/PermissionModule';
+import LocationModule, { LocationType } from '../../native/LocationModule';
 
 export default class LocationManager {
   private static instance: LocationManager;
-  private lastLocation: LocationObject | null = null;
+  private lastLocationAndroid: LocationType | null = null;
+  private lastLocationiOS: LocationType | null = null;
   private stopUpdate: { remove(): void } | undefined;
+  private subscription: EmitterSubscription | null = null;
 
   public async checkForLocationPermissions(): Promise<boolean> {
-    let permissionResponse = await Location.getForegroundPermissionsAsync();
-    if (permissionResponse.status === 'granted') {
-      this.startUpdates();
-      return true;
-    } else {
-      let { status } = await Location.requestForegroundPermissionsAsync();
-      if (status === 'granted') {
+    console.log("checkForLocationPermissions");
+    if (Platform.OS === 'ios') {
+      // old code checking for permissions using expo-location
+      // let permissionResponse = await Location.getForegroundPermissionsAsync();
+      // if (permissionResponse.status === 'granted') {
+      //   this.startUpdates();
+      //   return true;
+      // } else {
+      //   let { status } = await Location.requestForegroundPermissionsAsync();
+      //   if (status === 'granted') {
+      //     this.startUpdates();
+      //     return true;
+      //   } else {
+      //     this.stopLocationUpdates();
+      //     return false;
+      //   }
+      // }
+      let foregroundPermission = await PermissionModule.requestForegroundPermissions();
+      if (foregroundPermission) {
         this.startUpdates();
         return true;
       } else {
@@ -22,6 +39,17 @@ export default class LocationManager {
         return false;
       }
     }
+    if (Platform.OS === 'android') {
+      let foregroundPermission = await PermissionModule.requestForegroundPermissions();
+      if (foregroundPermission) {
+        this.startUpdates();
+        return true;
+      } else {
+        this.stopLocationUpdates();
+        return false;
+      }
+    }
+    return true;
   }
 
   public static getInstance(): LocationManager {
@@ -30,50 +58,74 @@ export default class LocationManager {
     }
     return LocationManager.instance;
   }
+
   public startUpdates() {
-    Location.watchPositionAsync(
-      {
-        accuracy: Accuracy.Highest,
-        timeInterval: 10000, // in millis
-        distanceInterval: 10, //in metres
-      },
-      (location) => {
+    if (Platform.OS === 'android') {
+      LocationModule.startLocationUpdates();
+      this.subscription = LocationModule.addLocationListener((location) => {
+        console.log('Location updated:', location);
         if (location != null) {
-          this.lastLocation = location;
+          this.lastLocationAndroid = location
         }
-      }
-    )
-      .then((r) => {
-        this.stopUpdate = r;
-      })
-      .catch((error) => {
-        Logger.getInstance().logEvent(
-          'LOCATION_MANAGER',
-          error.message,
-          LOG_TYPE.SDK_WARNING
-        );
       });
+    }
+
+    if (Platform.OS === 'ios') {
+      console.log("startUpdates");
+      LocationModule.startLocationUpdates();
+      // this.subscription = LocationModule.addLocationListener((location) => {
+      //   console.log('Location updated:', location);
+      //   if (location != null) {
+      //     this.lastLocationiOS = location
+      //   }
+      // });
+    }
   }
-  public getLastLocation(): DLocation {
-    if (this.lastLocation != null && this.lastLocation.coords != null) {
-      let accuracy = '';
-      if (this.lastLocation.coords.accuracy !== null) {
-        let accuracyVal = Math.round(this.lastLocation.coords.accuracy);
-        accuracy = accuracyVal.toString();
-      }
+
+  public async getLastLocation(): Promise<DLocation> {
+    if (Platform.OS === 'android' && this.lastLocationAndroid != null) {
+      console.log("lastLocationAndroid:", this.lastLocationAndroid);
       return {
-        latitude: this.lastLocation.coords.latitude.toString(),
-        longitude: this.lastLocation.coords.longitude.toString(),
-        accuracy: accuracy,
+        latitude: this.lastLocationAndroid.latitude.toString(),
+        longitude: this.lastLocationAndroid.longitude.toString(),
+        accuracy: this.lastLocationAndroid.accuracy.toString(),
       };
-    } else {
-      return { latitude: 'null', longitude: 'null', accuracy: 'null' };
     }
+    if (Platform.OS === 'ios') {
+      this.lastLocationiOS = await LocationModule.getLastLocation();
+      console.log("lastLocationiOS:", this.lastLocationiOS);
+      if(this.lastLocationiOS){
+        return {
+          latitude: this.lastLocationiOS.latitude.toString(),
+          longitude: this.lastLocationiOS.longitude.toString(),
+          accuracy: this.lastLocationiOS.accuracy.toString(),
+        };
+      }
+    }
+    return {
+      latitude: 'null',
+      longitude: 'null',
+      accuracy: 'null',
+    };
   }
+
+
   public stopLocationUpdates() {
     try {
-      if (this.stopUpdate) this.stopUpdate.remove();
-    } catch (error: any) {}
+      // code for android
+      if (Platform.OS === 'android') {
+        if (this.subscription) {
+          LocationModule.removeLocationListener(this.subscription);
+        }
+      }
+
+      // code for ios
+      if (Platform.OS === 'ios') {
+        if (this.subscription) {
+          LocationModule.removeLocationListener(this.subscription);
+        }
+      }
+    } catch (error: any) { }
   }
 }
 

package/src/native/LocationModule.ts

@@ -0,0 +1,52 @@
+import { NativeModules, NativeEventEmitter, EmitterSubscription } from 'react-native';
+
+const { LocationModule } = NativeModules;
+const locationEventEmitter = new NativeEventEmitter(LocationModule);
+
+const startLocationUpdates = async (): Promise<void> => {
+    try {
+        await LocationModule.startLocationUpdates();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const stopLocationUpdates = async (): Promise<void> => {
+    try {
+        await LocationModule.stopLocationUpdates();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const getLastLocation = async (): Promise<any> => {
+    try {
+        return LocationModule.getLastLocation();
+    } catch (error) {
+        console.error(error);
+        return null
+    }
+}
+
+
+export interface LocationType {
+    latitude: number;
+    longitude: number;
+    accuracy: number;
+}
+
+const addLocationListener = (callback: (location: LocationType) => void): EmitterSubscription => {
+    return locationEventEmitter.addListener('locationUpdated', callback);
+};
+
+const removeLocationListener = (subscription: EmitterSubscription): void => {
+    subscription.remove();
+};
+
+export default {
+    startLocationUpdates,
+    stopLocationUpdates,
+    addLocationListener,
+    removeLocationListener,
+    getLastLocation,
+};

package/src/native/PermissionModule.ts

@@ -0,0 +1,21 @@
+import { NativeModules } from 'react-native';
+
+const { PermissionsModule } = NativeModules;
+
+interface PermissionsModuleType {
+    requestForegroundPermissions: () => Promise<boolean>;
+    requestBackgroundPermissions: () => Promise<boolean>;
+}
+
+const requestForegroundPermissions = async (): Promise<boolean> => {
+    return PermissionsModule.requestForegroundPermissions();
+};
+
+const requestBackgroundPermissions = async (): Promise<boolean> => {
+    return PermissionsModule.requestBackgroundPermissions();
+};
+
+export default {
+    requestForegroundPermissions,
+    requestBackgroundPermissions,
+} as PermissionsModuleType;

package/src/utils/ExecTaskUtils.ts

@@ -19,7 +19,7 @@ export async function getBaseETResponse(
   mergedObjectiveIds: Array<string>,
   taskId: ExecutionTaskID
 ): Promise<BaseETResponse> {
- let lastLocation = LocationManager.getInstance().getLastLocation();
+ let lastLocation = await LocationManager.getInstance().getLastLocation();
  console.log("getBaseETResponse:lastLocation:",JSON.stringify(lastLocation))
 
   let cache = DispatchSdkCache.getInstance();
@@ -146,12 +146,12 @@ export function onTaskStart(
   const keys = DispatchSdkCache.KEYS;
   const cache = DispatchSdkCache.getInstance();
   (async () => {
-    let lastLocation = LocationManager.getInstance().getLastLocation();
+    let lastLocation = await LocationManager.getInstance().getLastLocation();
+    console.log("onTaskStart:lastLocation:",JSON.stringify(lastLocation));
     let location = {
       latitude: lastLocation.latitude,
       longitude: lastLocation.longitude,
     }
-    console.log("onTaskStart:lastLocation:",location)
     await cache.setKeyInCache(keys.TASK_START_TIME, Date.now().toString());
     await cache.setKeyInCache(keys.CURRENT_WORKING_TASK_ID, eventData.taskId);
     await cache.setObjectInCache(keys.TASK_START_LOCATION, location);

package/src/utils/SdkUtils.ts

@@ -7,6 +7,7 @@ import * as Location from 'expo-location';
 import NetworkUtil from './NetworkUtil';
 import { BaseError } from '../errors/BaseError';
 import ErrorCodes from '../errors/ErrorCodes';
+import PermissionModule from '../native/PermissionModule';
 
 const { DispatchSdkUtils } = NativeModules;
 
@@ -129,8 +130,16 @@ export default class SdkUtils {
   }
 
   public static async checkMandatory() {
-    if (Platform.OS === 'ios') return;
-    // if (Platform.OS === 'ios') return true;
+    if (Platform.OS === 'ios'){
+      const foregroundLocation = await PermissionModule.requestForegroundPermissions();
+      if (!(foregroundLocation)) {
+        throw new BaseError(
+          ErrorCodes.LOCATION_OR_GPS_NOT_ENABLED,
+          'Location or GPS not enabled'
+        );
+      }
+      return;
+    }
     const dateTimeCheck = await (
       DispatchSdkUtils as DispatchUtilsInterface
     ).isAutomaticDateTimeEnabled();
@@ -143,9 +152,10 @@ export default class SdkUtils {
     if (Platform.OS === 'android') {
       await Location.enableNetworkProviderAsync();
       let locationServicesCheck = await Location.hasServicesEnabledAsync();
-      const foregroundLocation =
-        await Location.requestForegroundPermissionsAsync();
-      const bgLocation = await Location.requestBackgroundPermissionsAsync();
+      const foregroundLocation = await PermissionModule.requestForegroundPermissions();
+      // await Location.requestForegroundPermissionsAsync(); //permission code using expo module
+      const bgLocation = await PermissionModule.requestBackgroundPermissions();
+      // await Location.requestBackgroundPermissionsAsync(); //permission code using expo module
       if (!(locationServicesCheck && foregroundLocation && bgLocation)) {
         throw new BaseError(
           ErrorCodes.LOCATION_OR_GPS_NOT_ENABLED,