From 517c5ca73d54e9bdfab370c488f37a3ebc2ff4d6 Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Mon, 19 Apr 2021 16:20:20 +0200
Subject: [PATCH] Update zxing-android-embedded and small related fixes (#1642)

---
 app/build.gradle                                                | 2 +-
 app/src/main/AndroidManifest.xml                                | 2 ++
 .../com/nutomic/syncthingandroid/activities/DeviceActivity.java | 2 ++
 .../com/nutomic/syncthingandroid/activities/FolderActivity.java | 2 ++
 .../nutomic/syncthingandroid/activities/QRScannerActivity.java  | 1 -
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f29af378..f3752775 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.annimon:stream:1.2.2'
     implementation 'com.android.volley:volley:1.2.0'
 
-    implementation ('com.journeyapps:zxing-android-embedded:3.6.0') { transitive = false }
+    implementation ('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
     implementation 'com.google.zxing:core:3.3.0'
 
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ebe7140..d925360e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,6 +26,8 @@
     <!-- CAMERA is required for the QR Code Scanner -->
     <uses-permission android:name="android.permission.CAMERA" />
 
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+
     <application
         android:allowBackup="false"
         android:fullBackupContent="false"
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java
index 980f0ddb..cd4de415 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java
@@ -395,6 +395,8 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis
      */
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
         if (requestCode == QR_SCAN_REQUEST_CODE) {
             if (resultCode == Activity.RESULT_OK) {
                 String scanResult = intent.getStringExtra(QRScannerActivity.QR_RESULT_ARG);
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
index c3123b57..e2e16eab 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
@@ -514,6 +514,8 @@ public class FolderActivity extends SyncthingActivity
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
         if (resultCode == Activity.RESULT_OK && requestCode == CHOOSE_FOLDER_REQUEST) {
             // This result case only occurs on API level >= Build.VERSION_CODES.LOLLIPOP (21)
             mFolderUri = data.getData();
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java
index 6a24e008..01eef49f 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/QRScannerActivity.java
@@ -34,7 +34,6 @@ public class QRScannerActivity extends ThemedAppCompatActivity implements Barcod
     private final int RC_HANDLE_CAMERA_PERM = 888;
 
     private DecoratedBarcodeView barcodeView;
-    private TextView cancleButton;
 
     // region === Activity Lifecycle ===
     @Override