From 617be576f8a1bc41ec0b32ea57c84e44626b7352 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Fri, 19 Feb 2021 19:29:57 +0530
Subject: build: upgrade to ZXING 4.1.0

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle                    | 2 +-
 ui/src/main/AndroidManifest.xml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 76bbcb05..807a878f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         lifecycleRuntimeKtxVersion = '2.3.0'
         materialComponentsVersion = '1.3.0'
         preferenceVersion = '1.1.1'
-        zxingEmbeddedVersion = '3.6.0'
+        zxingEmbeddedVersion = '4.1.0'
 
         groupName = 'com.wireguard.android'
     }
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 56e7184c..ce527498 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:name="android.software.leanback"
         android:required="false" />
     <uses-feature
-        android:name="android.hardware.camera"
+        android:name="android.hardware.camera.any"
         android:required="false" />
 
     <permission
@@ -29,6 +29,9 @@
         android:label="@string/permission_label"
         android:protectionLevel="dangerous" />
 
+    <!-- This is safe to override, the APIs we use work perfectly fine on Android 6 -->
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+
     <application
         android:name=".Application"
         android:allowBackup="false"
-- 
cgit v1.2.3-59-g8ed1b