100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Android console: Location permission improvement (#873)
Michael Rademakerc0ad28ab4c36
diff --git a/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.ktindex 07dfbb5dd..94789711f 100644--- a/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt+++ b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt@@ -49,6 +49,10 @@ open class OrMainActivity : Activity() {OrMainActivity::class.java.name)+ private val locationResponseCode = 555+ private var locationCallback: GeolocationPermissions.Callback? = null;+ private var locationOrigin: String? = null;+private lateinit var binding: ActivityOrMainBindingprivate lateinit var sharedPreferences: SharedPreferences@@ -329,6 +333,8 @@ open class OrMainActivity : Activity() {}}++@SuppressLint("SetJavaScriptEnabled")fun initializeWebView() {LOG.fine("Initializing web view")@@ -434,7 +440,19 @@ open class OrMainActivity : Activity() {origin: String?,callback: GeolocationPermissions.Callback?) {- callback?.invoke(origin, true, false)+ if(checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {+ callback?.invoke(origin, true, false)+ } else {+ locationCallback = callback+ locationOrigin = origin+ requestPermissions(+ arrayOf(+ Manifest.permission.ACCESS_FINE_LOCATION,+ Manifest.permission.ACCESS_COARSE_LOCATION+ ),+ locationResponseCode+ )+ }}override fun onProgressChanged(view: WebView, progress: Int) {@@ -566,6 +584,10 @@ open class OrMainActivity : Activity() {}} else if (requestCode == GeofenceProvider.locationResponseCode) {geofenceProvider?.onRequestPermissionsResult(this)+ } else if (requestCode == locationResponseCode) {+ if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {+ locationCallback?.invoke(locationOrigin, true, false)+ }}super.onRequestPermissionsResult(requestCode, permissions, grantResults)}