meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

downgrade zxing:core for minSdkVersion 21

Browse source
This commit is contained in:
andrekir 2022-01-10 00:33:26 -03:00
parent 58136c9cf4
commit e8e389930e
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View file

@ -12,9 +12,6 @@
android:name="android.hardware.location.gps"
android:required="false" />
<!-- per https://github.com/journeyapps/zxing-android-embedded to force support for build 22 -->
<uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

1
app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
View file

@ -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("")