diff --git a/app/build.gradle b/app/build.gradle index 31e4224a4..dcd2865ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -186,9 +186,9 @@ dependencies { // https://firebase.google.com/docs/android/setup#available-libraries // barcode support - // per https://github.com/journeyapps/zxing-android-embedded for support of android version 22 - implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } - implementation 'com.google.zxing:core:3.4.1' + // per https://github.com/journeyapps/zxing-android-embedded#older-sdk-versions for minSdkVersion 21 + implementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false } + implementation 'com.google.zxing:core:3.3.0' // <-- don't update def work_version = '2.7.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 91cfdb93d..7e2a26a86 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,9 +12,6 @@ android:name="android.hardware.location.gps" android:required="false" /> - - - diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt index b2ca3fb80..73b644550 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt @@ -211,6 +211,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging { binding.scanButton.setOnClickListener { if ((requireActivity() as MainActivity).hasCameraPermission()) { + debug("Starting QR code scanner") val zxingScan = IntentIntegrator.forSupportFragment(this) zxingScan.setCameraId(0) zxingScan.setPrompt("")