react-native-pointr 8.14.0 → 8.14.3

package/android/src/main/java/com/pointr/PointrMapWidgetActivity.kt

@@ -1,5 +1,6 @@
 package com.pointr
 
+import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Build
@@ -9,6 +10,7 @@ import android.util.Log
 import android.view.WindowManager
 import android.widget.TextView
 import android.widget.Toast
+import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.pointrlabs.core.management.Pointr
@@ -21,10 +23,17 @@ import com.pointrlabs.core.positioning.model.PositioningTypes.INVALID_INTEGER
 import com.facebook.react.bridge.Callback
 import com.pointr.PointrModule.Companion.mapEventsListenerKey
 import com.pointrlabs.core.geometry.GeoPoint
+import com.pointrlabs.core.management.DataManager
+import com.pointrlabs.core.management.models.ErrorMessage
+import com.pointrlabs.core.management.models.Site
 import com.pointrlabs.core.map.handlers.ExitButtonEventsHandler
 import com.pointrlabs.core.map.models.PTRMapSymbolLayer
 import com.pointrlabs.core.map.models.events_listeners.MapEventsListener
+import com.pointrlabs.core.site.SiteManager
 import java.lang.IllegalArgumentException
+import java.util.concurrent.Semaphore
+import java.util.concurrent.TimeUnit
+import kotlin.random.Random
 
 
 /**
@@ -54,6 +63,8 @@ class PointrMapWidgetActivity : AppCompatActivity() {
 
     var pendingAction: () -> Unit = {}
 
+    private val timeoutInSeconds = 15L
+
     private var ptrMapWidgetFragment: PTRMapWidgetFragment? = null
 
     private var mapEventsListener: MapEventsListener? = null
@@ -65,22 +76,25 @@ class PointrMapWidgetActivity : AppCompatActivity() {
 
     private val pointrListener = object : PointrListener {
         override fun onStateUpdated(p0: Pointr.State?) {
-            Plog.v("Pointr state updated: ${p0?.name}")
-            if (p0 == Pointr.State.RUNNING) {
+            val state = p0 ?: return
+            Plog.v("Pointr state updated: ${state.name}")
+            if (state == Pointr.State.RUNNING) {
                 Plog.v("Pointr is Running")
                 pointr?.removeListener(this)
+                if (PointrModule.shouldRequestPermissionsAtStartup) {
+                    requestPermissions()
+                } else {
+                    pointr?.permissionManager?.shouldRequestLocationPermissionForWhileInUse = false
+                    pointr?.permissionManager?.shouldRequestBluetoothPermission = false
+                    pointr?.permissionManager?.shouldRequestLocationPermissionForAlways = false
+                }
                 runOnUiThread {
                     pendingAction.invoke()
                     pendingAction = {}
                 }
-            } else if (p0 == Pointr.State.FAILED_VALIDATION
-                || p0 == Pointr.State.FAILED_REGISTRATION
-                || p0 == Pointr.State.FAILED_INVALID_DEEPLINK_URL
-                || p0 == Pointr.State.NO_INTERNET
-                || p0 == Pointr.State.OFF
-            ) {
-                Plog.e("Pointr could not start. Current state: ${p0.name}")
-                callback?.invoke("Starting Pointr resulted in ${p0.name}")
+            } else if (state.`val` <= Pointr.State.OFF.`val`) {
+                Plog.e("Pointr could not start. Current state: ${state.name}")
+                callback?.invoke("Starting Pointr resulted in ${state.name}")
                 callback = null
                 pointr?.removeListener(this)
                 runOnUiThread {
@@ -93,6 +107,23 @@ class PointrMapWidgetActivity : AppCompatActivity() {
         }
     }
 
+    private fun requestPermissions() {
+        val permissionManager = Pointr.getPointr()?.permissionManager ?: run {
+            Log.e("Pointr", "Permission manager is not ready")
+            return
+        }
+        val permissionList = arrayListOf<String>()
+        if (!permissionManager.hasLocationPermissionAlwaysOrWhileInUse)
+            permissionList.add(Manifest.permission.ACCESS_FINE_LOCATION)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !permissionManager.hasBluetoothPermission) {
+            permissionList.add(Manifest.permission.BLUETOOTH_SCAN)
+            permissionList.add(Manifest.permission.BLUETOOTH_CONNECT)
+        }
+        if (permissionList.isEmpty()) return
+        requestPermissions(permissionList.toTypedArray(), Random.nextInt(1024, 65_536))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.pointr_map_widget_activity_layout)
@@ -138,8 +169,8 @@ class PointrMapWidgetActivity : AppCompatActivity() {
 
     private fun showMapWidgetBasedOnAction() {
 
-        PTRMapWidgetFragment.newInstance(configuration = mapWidgetConfiguration) {
-            ptrMapWidgetFragment = it.show(supportFragmentManager, R.id.fragment_container)
+        PTRMapWidgetFragment.newInstance(configuration = mapWidgetConfiguration) { widget->
+            ptrMapWidgetFragment = widget.show(supportFragmentManager, R.id.fragment_container)
             ptrMapWidgetFragment?.exitButtonEventsHandler = object : ExitButtonEventsHandler() {
                 override fun onExitClicked(mapWidget: PTRMapWidgetFragment, exitButton: TextView) {
                     this@PointrMapWidgetActivity.finish()
@@ -151,6 +182,7 @@ class PointrMapWidgetActivity : AppCompatActivity() {
                     PointrModule.CustomMapEventsListener::class.java
                 )
             } else {
+                @Suppress("DEPRECATION")
                 intent.getParcelableExtra(mapEventsListenerKey)
             }
             mapEventsListener?.let { ptrMapWidgetFragment?.addListener(it) }
@@ -160,7 +192,7 @@ class PointrMapWidgetActivity : AppCompatActivity() {
                     if (siteExternalId != null) {
                         val animationTypeInt = intent.getIntExtra(animationTypeKey, 0)
                         val animationType = try {
-                            PTRMapAnimationType.entries[animationTypeInt]
+                            PTRMapAnimationType.values()[animationTypeInt]
                         } catch (ex: IllegalArgumentException) {
                             PTRMapAnimationType.flyOver
                         }
@@ -262,6 +294,7 @@ class PointrMapWidgetActivity : AppCompatActivity() {
                         } catch (ex: IllegalArgumentException) {
                             PTRMapAnimationType.flyOver
                         }
+
                         ptrMapWidgetFragment?.showPathFinding(
                             siteExternalId,
                             poiExternalId,
@@ -310,9 +343,9 @@ class PointrMapWidgetActivity : AppCompatActivity() {
         } catch (ex: IllegalArgumentException) {
             PTRMapAnimationType.flyOver
         }
-        val siteManager = pointr?.siteManager ?: run {
+        val dataManager = pointr?.dataManager ?: run {
             this@PointrMapWidgetActivity.finish()
-            callback?.invoke("Site Manager is not ready")
+            callback?.invoke("Data Manager is not ready")
             callback = null
             return
         }
@@ -328,22 +361,53 @@ class PointrMapWidgetActivity : AppCompatActivity() {
             callback = null
             return
         }
-        val site = siteManager.getSite(siteExternalId) ?: run {
+        val theSite = getSite(siteExternalId) ?: run {
             this@PointrMapWidgetActivity.finish()
             callback?.invoke("Site `$siteExternalId` does not exist.")
             callback = null
             return
         }
-        val sourcePoi = poiManager.getPoiByExternalIdentifier(site, sourcePoiExternalId) ?: run {
+        val dataManagementSemaphore = Semaphore(0)
+        val dataManagerListener = object : DataManager.Listener {
+            override fun onDataManagerCompleteAllForSite(
+                site: Site,
+                isSuccessful: Boolean,
+                isOnlineData: Boolean,
+                errors: List<ErrorMessage?>?
+            ) {
+                if (theSite == site && isOnlineData) {
+                    dataManagementSemaphore.release()
+                }
+            }
+        }
+        dataManager.addListener(dataManagerListener)
+        if (!dataManager.isSiteContentReady(theSite)) {
+            Plog.i("Data for site: ${theSite.title} is not ready. Will start and wait for completion")
+            dataManager.loadDataForSite(theSite)
+            val didAcquire = dataManagementSemaphore.tryAcquire(timeoutInSeconds, TimeUnit.SECONDS)
+            if (!didAcquire) {
+                Plog.e("Data management for site: ${theSite.title} did not complete in time")
+                dataManager.removeListener(dataManagerListener)
+                dataManagementSemaphore.release()
+                this@PointrMapWidgetActivity.finish()
+                callback?.invoke("Data management for site: ${theSite.title} did not complete in time")
+                callback = null
+                return
+            }
+        } else {
+            Plog.v("Data for site: ${theSite.title} is ready. Moving on.")
+            dataManager.removeListener(dataManagerListener)
+        }
+        val sourcePoi = poiManager.getPoiByExternalIdentifier(theSite, sourcePoiExternalId) ?: run {
             this@PointrMapWidgetActivity.finish()
-            callback?.invoke("Source poi `$sourcePoiExternalId` does not exist within site `${site.title}`.")
+            callback?.invoke("Source poi `$sourcePoiExternalId` does not exist within site `${theSite.title}`.")
             callback = null
             return
         }
         val destinationPoi =
-            poiManager.getPoiByExternalIdentifier(site, destinationPoiExternalId) ?: run {
+            poiManager.getPoiByExternalIdentifier(theSite, destinationPoiExternalId) ?: run {
                 this@PointrMapWidgetActivity.finish()
-                callback?.invoke("Destination poi `$destinationPoiExternalId` does not exist within site ${site.title}.")
+                callback?.invoke("Destination poi `$destinationPoiExternalId` does not exist within site ${theSite.title}.")
                 callback = null
                 return
             }
@@ -400,4 +464,22 @@ class PointrMapWidgetActivity : AppCompatActivity() {
             }
         }
     }
+
+    @WorkerThread
+        private fun getSite(siteExternalId: String): Site? {
+            val siteManager = pointr?.siteManager ?: return null
+            if (siteManager.getSites().isEmpty()) {
+                val semaphore = Semaphore(0)
+                val listener = object : SiteManager.Listener {
+                    override fun onSiteManagerDataChanged() {
+                        semaphore.release()
+                    }
+                }
+                siteManager.addListener(listener)
+                semaphore.tryAcquire(timeoutInSeconds, TimeUnit.SECONDS)
+                siteManager.removeListener(listener)
+                semaphore.release()
+            }
+            return siteManager.getSite(siteExternalId)
+        }
 }

package/android/src/main/java/com/pointr/PointrModule.kt

@@ -1,8 +1,9 @@
 package com.pointr
 
+import android.Manifest
 import android.annotation.SuppressLint
-import android.content.ComponentName
 import android.content.Intent
+import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
 import android.util.Log
@@ -21,36 +22,85 @@ import com.pointrlabs.core.management.models.Level
 import com.pointrlabs.core.management.models.PTRParams
 import com.pointrlabs.core.management.models.PointrEnvironment
 import com.pointrlabs.core.management.models.Site
+import com.pointrlabs.core.map.models.PTRError
 import com.pointrlabs.core.map.models.events_listeners.MapEventsListener
 import com.pointrlabs.core.map.views.PTRMapFragment
-import com.pointrlabs.core.nativecore.wrappers.Plog.LogLevel
-import com.pointrlabs.core.nativecore.wrappers.Plog.v
+import com.pointrlabs.core.map.views.helper_views.PTRDialog
+import com.pointrlabs.core.nativecore.wrappers.Plog
 import com.pointrlabs.core.positioning.model.CalculatedLocation
 import com.pointrlabs.core.positioning.model.PositioningTypes
 import org.json.JSONObject
+import kotlin.random.Random
 import kotlin.reflect.KMutableProperty1
 
 @SuppressLint("LogNotTimber")
 class PointrModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
 
+    private val positionManagerListener: PositionManager.Listener
+    private var listenerCount = 0
+
     init {
+        positionManagerListener = object : PositionManager.Listener {
+            override fun onPositionManagerCalculatedLocation(p0: CalculatedLocation?) {
+                val calculatedLocation = p0 ?: return
+                val params = applyParamsForCalculatedLocation(calculatedLocation)
+                sendEventToJs(reactContext, OnPositionManagerCalculatedLocation, params)
+            }
+
+            override fun onPositionManagerDetectedPositionLevelChange(p0: Level) {}
+            override fun onPositionManagerPositionIsFading() {}
+            override fun onPositionManagerPositionIsLost() {}
+            override fun onPositionManagerPositioningServiceStateChangedTo(p0: PositioningTypes.PositioningServiceState?) {}
+        }
         setPointrListeners()
     }
 
-    private var listenerCount = 0
 
     override fun getName(): String {
         return NAME
     }
 
+    @ReactMethod
+    fun shouldRequestPermissionsAtStartup(shouldRequestPermissions: Boolean) {
+        shouldRequestPermissionsAtStartup = shouldRequestPermissions
+        Pointr.getPointr()?.permissionManager?.shouldRequestLocationPermissionForWhileInUse =
+            shouldRequestPermissionsAtStartup
+        Pointr.getPointr()?.permissionManager?.shouldRequestBluetoothPermission =
+            shouldRequestPermissionsAtStartup
+        Pointr.getPointr()?.permissionManager?.shouldRequestLocationPermissionForAlways =
+            shouldRequestPermissionsAtStartup
+    }
+
+    @ReactMethod
+    fun requestPermissions() {
+        val permissionManager = Pointr.getPointr()?.permissionManager ?: run {
+            Log.e("Pointr", "Permission manager is not ready")
+            return
+        }
+        val activity = currentActivity ?: run {
+            Log.e("Pointr", "Could not get current activity")
+            return
+        }
+        val permissionList = arrayListOf<String>()
+        if (!permissionManager.hasLocationPermissionAlwaysOrWhileInUse)
+            permissionList.add(Manifest.permission.ACCESS_FINE_LOCATION)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !permissionManager.hasBluetoothPermission) {
+            permissionList.add(Manifest.permission.BLUETOOTH_SCAN)
+            permissionList.add(Manifest.permission.BLUETOOTH_CONNECT)
+        }
+        if (permissionList.isEmpty()) return
+        activity.requestPermissions(permissionList.toTypedArray(), Random.nextInt(1024, 65_536))
+    }
+
     @ReactMethod
     fun addListener(eventName: String) {
         // TODO as per documentation, this should get invoked when addListener is called
         // on the JS side, but it does not get invoked
         if (listenerCount == 0) {
             // Set up any upstream listeners or background tasks as necessary
-            start { args -> v("Pointr started and listeners added") }
+            start { args -> Plog.v("Pointr started and listeners added") }
         }
         listenerCount += 1
     }
@@ -265,7 +315,7 @@ class PointrModule(reactContext: ReactApplicationContext) :
         const val OnBuildingClicked = "OnBuildingClicked"
         const val OnSiteClicked = "OnSiteClicked"
 
-
+        var shouldRequestPermissionsAtStartup = true
 
         fun sendEventToJs(
             reactContext: ReactApplicationContext,
@@ -296,19 +346,6 @@ class PointrModule(reactContext: ReactApplicationContext) :
      * which listens to this event.
      */
 
-    private val positionManagerListener = object : PositionManager.Listener {
-        override fun onPositionManagerCalculatedLocation(p0: CalculatedLocation?) {
-            val calculatedLocation = p0 ?: return
-            val params = applyParamsForCalculatedLocation(calculatedLocation)
-            sendEventToJs(reactContext, OnPositionManagerCalculatedLocation, params)
-        }
-
-        override fun onPositionManagerDetectedPositionLevelChange(p0: Level) {}
-        override fun onPositionManagerPositionIsFading() {}
-        override fun onPositionManagerPositionIsLost() {}
-        override fun onPositionManagerPositioningServiceStateChangedTo(p0: PositioningTypes.PositioningServiceState?) {}
-    }
-
     open class CustomMapEventsListener() : MapEventsListener, Parcelable {
 
         private var reactContext: ReactApplicationContext? = null
@@ -366,6 +403,33 @@ class PointrModule(reactContext: ReactApplicationContext) :
                 sendEventToJs(it, OnSiteClicked, params)
             }
         }
+
+        override fun mapDidFailToLoad(mapFragment: PTRMapFragment, ptrError: PTRError) {
+            Plog.e("Pointr - Map failed to load: ${ptrError.ptrUIError?.code}.${ptrError.ptrUIError?.message}")
+            // take reference to the activity and dismiss the fragment
+            // we need to keep the activity to show the dialog
+            val activity = mapFragment.activity ?: return
+            val ptrMapWidgetFragment = mapFragment.parentFragment ?: return
+            ptrMapWidgetFragment.parentFragmentManager.beginTransaction().remove(ptrMapWidgetFragment).commit()
+            val ptrDialogModel = PTRDialog.PtrDialogModel(
+                iconDrawableResId = com.pointrlabs.core.R.drawable.error_generic,
+                bigTextString = activity.getString(com.pointrlabs.core.R.string.ptr_error_title_map_loading_generic_error),
+                smallTextString = activity.getString(com.pointrlabs.core.R.string.no_internet),
+                primaryButton = PTRDialog.PtrDialogButtonModel(
+                    activity.getString(com.pointrlabs.core.R.string.ok)
+                ) { dialog, _ ->
+                    dialog.dismiss()
+                    // finish the activity after we are done with the dialog
+                    activity.finish()
+                },
+                secondaryButton = null,
+                errorCode = ptrError.ptrUIError?.errorCode
+            )
+            val dialog = PTRDialog(activity, ptrDialogModel)
+            dialog.setCancelable(false)
+            dialog.setCanceledOnTouchOutside(false)
+            dialog.show()
+        }
         // endregion [com.pointrlabs.core.map.models.events_listeners.CustomMapEventsListener]
     }
 
@@ -415,7 +479,7 @@ class PointrModule(reactContext: ReactApplicationContext) :
             Log.e(name, "Could not set environment of PTRParams for env: $env")
         }
         try {
-            val ptrLogLevel = LogLevel.values()[logLevel]
+            val ptrLogLevel = Plog.LogLevel.entries[logLevel]
             ptrParams.logLevel = ptrLogLevel
         } catch (ex: IllegalArgumentException) {
             Log.e(name, "Could not set log level of PTRParams for logLevel: $logLevel")
@@ -430,9 +494,9 @@ class PointrModule(reactContext: ReactApplicationContext) :
                 Log.v(name, "Pointr state updated: ${p0?.name}}")
                 val state = p0 ?: return
                 if (state.`val` > Pointr.State.OFF.`val` && state.`val` < Pointr.State.RUNNING.`val`) return
+                pointr.removeListener(this)
                 setPointrListeners()
                 action.invoke(state.name)
-                pointr.removeListener(this)
             }
         })
     }
@@ -447,6 +511,13 @@ class PointrModule(reactContext: ReactApplicationContext) :
         val pointr = Pointr.getPointr() ?: return
         if (pointr.state != Pointr.State.RUNNING) return
         pointr.positionManager?.addListener(positionManagerListener)
+        if (shouldRequestPermissionsAtStartup) {
+            requestPermissions()
+        } else {
+            pointr.permissionManager?.shouldRequestLocationPermissionForWhileInUse = false
+            pointr.permissionManager?.shouldRequestBluetoothPermission = false
+            pointr.permissionManager?.shouldRequestLocationPermissionForAlways = false
+        }
     }
 
     fun setPointrMapWidgetConfiguration(jsonObject: JSONObject) {

package/android/src/main/java/com/pointr/PointrPackage.kt

@@ -12,6 +12,6 @@ class PointrPackage : ReactPackage {
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return emptyList()
+    return listOf(PTRMapWidgetManager(reactContext))
   }
 }

package/ios/PTRMapWidgetContainerView.h

@@ -0,0 +1,19 @@
+#import <React/RCTComponent.h>
+#import <PointrKit/PointrKit.h>
+#import "react_native_pointr-Swift.h"
+
+extern NSString * const kLayerStaticPath;
+
+@interface PTRMapWidgetContainerView: UIView<PTRConfigurationManagerDelegate, PointrStateChangeListener, PTRSiteManagerDelegate, PTRDataManagerDelegate, PTRPathManagerDelegate>
+
+@property (nonatomic, copy) RCTBubblingEventBlock onMapWidgetDidEndLoading;
+@property(readonly, atomic, strong) PTRMapWidgetViewController *mapWidget;
+@property (nonatomic, strong) dispatch_semaphore_t semaphore;
+@property (nonatomic, strong) PTRSite *site;
+
+
+- (void)ptrMapWidgetDidEndLoadingWithParameters:(NSDictionary *)parameters;
+-(PTRMapWidgetViewController *) getMapWidget;
+-(void) showStaticPath:(NSString *) siteExternalIdentifier fromPoiExternalIdentifier:(NSString *) fromPoiExternalIdentifier toPoiExternalIdentifier:(NSString *) toPoiExternalIdentifier;
+
+@end