Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Few fixes for QrScannerProvider.kt Fixed issue with launcher images not using correct resource

Michael Rademaker7f47c71146bf
diff --git a/console/android/ORLib/src/main/AndroidManifest.xml b/console/android/ORLib/src/main/AndroidManifest.xml
index 2d7b54215..4101d86f0 100644
--- a/console/android/ORLib/src/main/AndroidManifest.xml
+++ b/console/android/ORLib/src/main/AndroidManifest.xml
@@ -2,4 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.openremote.orlib">
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.CAMERA" />
</manifest>
\ No newline at end of file
diff --git a/console/android/ORLib/src/main/java/io/openremote/orlib/service/QrScannerProvider.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/service/QrScannerProvider.kt
index f4ede87f4..4f90f7277 100644
--- a/console/android/ORLib/src/main/java/io/openremote/orlib/service/QrScannerProvider.kt
+++ b/console/android/ORLib/src/main/java/io/openremote/orlib/service/QrScannerProvider.kt
@@ -19,7 +19,6 @@ class QrScannerProvider(val context: Context) {
private const val cameraPermissionAskedKey = "CameraPermissionAsked"
private const val qrDisabledKey = "qrDisabled"
private const val version = "qr"
- const val REQUEST_CAMERA_PERMISSION = 201
const val REQUEST_SCAN_QR = 222
}
@@ -57,29 +56,16 @@ class QrScannerProvider(val context: Context) {
Manifest.permission.CAMERA
) == PackageManager.PERMISSION_GRANTED
-
-
- if (!hasPermission && !sharedPreferences.getBoolean(
- cameraPermissionAskedKey, false
- )
- ) {
- sharedPreferences.edit().putBoolean(cameraPermissionAskedKey, true).apply()
- ActivityCompat.requestPermissions(
- context as Activity,
- arrayOf(Manifest.permission.CAMERA),
- REQUEST_CAMERA_PERMISSION
- )
- enableCallback = callback
- } else {
- callback?.accept(
- hashMapOf(
- "action" to "PROVIDER_ENABLE",
- "provider" to "qr",
- "hasPermission" to hasPermission,
- "success" to true
- )
+ callback?.accept(
+ hashMapOf(
+ "action" to "PROVIDER_ENABLE",
+ "provider" to "qr",
+ "hasPermission" to hasPermission,
+ "success" to true,
+ "enabled" to true,
+ "disabled" to sharedPreferences.contains(qrDisabledKey)
)
- }
+ )
}
fun disable(): Map<String, Any> {
@@ -95,37 +81,6 @@ class QrScannerProvider(val context: Context) {
)
}
- fun onRequestPermissionsResult(
- requestCode: Int,
- permissions: Array<String>,
- grantResults: IntArray
- ) {
- if (requestCode == REQUEST_CAMERA_PERMISSION && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
- enableCallback?.accept(
- hashMapOf(
- "action" to "PROVIDER_ENABLE",
- "provider" to "qr",
- "hasPermission" to true,
- "success" to true
- )
- )
- } else {
- AlertDialog.Builder(context)
- .setIcon(R.mipmap.ic_launcher)
- .setTitle(R.string.camera_needed_alert_title)
- .setMessage(R.string.camera_needed_alert_body)
- .setNegativeButton(R.string.no, null)
- .setPositiveButton(R.string.yes) { dialog, which ->
- ActivityCompat.requestPermissions(
- context as Activity,
- arrayOf(Manifest.permission.CAMERA),
- REQUEST_CAMERA_PERMISSION
- )
- }
- .show()
- }
- }
-
fun startScanner(activity: Activity) {
val intent = Intent(activity, QrScannerActivity::class.java)
activity.startActivityForResult(intent, REQUEST_SCAN_QR)
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.kt
index 64f07855b..36773cf21 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
@@ -517,8 +517,6 @@ open class OrMainActivity : Activity() {
}
} else if (requestCode == GeofenceProvider.locationResponseCode) {
geofenceProvider?.onRequestPermissionsResult(this)
- } else if (requestCode == QrScannerProvider.REQUEST_CAMERA_PERMISSION) {
- qrScannerProvider?.onRequestPermissionsResult(requestCode, permissions, grantResults)
}
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
}
@@ -527,7 +525,13 @@ open class OrMainActivity : Activity() {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == QrScannerProvider.REQUEST_SCAN_QR) {
val qrResult = data?.getStringExtra("result")
- notifyClient(hashMapOf("result" to qrResult))
+
+ val response = hashMapOf(
+ "action" to "SCAN_QR",
+ "provider" to "qr",
+ "data" to hashMapOf("result" to qrResult)
+ )
+ notifyClient(response)
}
}
@@ -567,6 +571,9 @@ open class OrMainActivity : Activity() {
provider.equals("storage", ignoreCase = true) -> {
handleStorageProviderMessage(it)
}
+ provider.equals("qr", ignoreCase = true) -> {
+ handleQrScannerProviderMessage(it)
+ }
}
}
}
diff --git a/console/android/ORLib/src/main/java/io/openremote/orlib/ui/QrScannerActivity.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/QrScannerActivity.kt
index 7a5218729..53b6f1a2e 100644
--- a/console/android/ORLib/src/main/java/io/openremote/orlib/ui/QrScannerActivity.kt
+++ b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/QrScannerActivity.kt
@@ -2,11 +2,13 @@ package io.openremote.orlib.ui
import android.Manifest
import android.annotation.SuppressLint
+import android.app.Activity
import android.content.Intent
import android.content.pm.PackageManager
import android.os.Bundle
import android.view.SurfaceHolder
import android.view.SurfaceView
+import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import com.google.android.gms.vision.CameraSource
@@ -16,6 +18,7 @@ import com.google.android.gms.vision.barcode.Barcode
import com.google.android.gms.vision.barcode.BarcodeDetector
import io.openremote.orlib.R
import io.openremote.orlib.databinding.ActivityOrQrScannerBinding
+import io.openremote.orlib.service.QrScannerProvider
import java.io.IOException
class QrScannerActivity : AppCompatActivity() {
@@ -108,6 +111,20 @@ class QrScannerActivity : AppCompatActivity() {
} catch (e: IOException) {
e.printStackTrace()
}
+ } else {
+ AlertDialog.Builder(this)
+ .setIcon(R.mipmap.ic_launcher)
+ .setTitle(R.string.camera_needed_alert_title)
+ .setMessage(R.string.camera_needed_alert_body)
+ .setNegativeButton(R.string.no, null)
+ .setPositiveButton(R.string.yes) { dialog, which ->
+ ActivityCompat.requestPermissions(
+ this,
+ arrayOf(Manifest.permission.CAMERA),
+ REQUEST_CAMERA_PERMISSION
+ )
+ }
+ .show()
}
}
diff --git a/console/android/ORLib/src/main/res/drawable/app_icon.xml b/console/android/ORLib/src/main/res/drawable/app_icon.xml
deleted file mode 100644
index 37d07f447..000000000
--- a/console/android/ORLib/src/main/res/drawable/app_icon.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_notification">
-</bitmap>
\ No newline at end of file
diff --git a/console/android/ORLib/src/main/res/drawable/or_app_icon.png b/console/android/ORLib/src/main/res/drawable/or_app_icon.png
deleted file mode 100644
index 34fed749a..000000000
Binary files a/console/android/ORLib/src/main/res/drawable/or_app_icon.png and /dev/null differ
diff --git a/console/android/ORLib/src/main/res/drawable/or_logo.png b/console/android/ORLib/src/main/res/drawable/or_logo.png
deleted file mode 100644
index d7154867e..000000000
Binary files a/console/android/ORLib/src/main/res/drawable/or_logo.png and /dev/null differ
diff --git a/console/android/ORLib/src/main/res/drawable/or_push_icon.png b/console/android/ORLib/src/main/res/drawable/or_push_icon.png
deleted file mode 100644
index e1020884e..000000000
Binary files a/console/android/ORLib/src/main/res/drawable/or_push_icon.png and /dev/null differ
diff --git a/console/android/ORLib/src/main/res/drawable/or_splash.png b/console/android/ORLib/src/main/res/drawable/or_splash.png
deleted file mode 100644
index 0464d21b3..000000000
Binary files a/console/android/ORLib/src/main/res/drawable/or_splash.png and /dev/null differ
diff --git a/console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 036d09bc5..000000000
--- a/console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@color/ic_launcher_background"/>
- <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 036d09bc5..000000000
--- a/console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@color/ic_launcher_background"/>
- <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/console/android/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index f4648418e..000000000
Binary files a/console/android/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/console/android/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 34d62333b..000000000
Binary files a/console/android/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/console/android/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index eadf4e618..000000000
Binary files a/console/android/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/console/android/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index c4f34f813..000000000
Binary files a/console/android/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/console/android/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index d854c0f84..000000000
Binary files a/console/android/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ