diff options
author | 2025-05-31 03:47:10 +0200 | |
---|---|---|
committer | 2025-05-31 03:47:10 +0200 | |
commit | d45b1ea9a754b178acd2a95705802868b8fbc8dc (patch) | |
tree | a03c6f2b24c323348c6b51e79be0c0fb3462ac70 | |
parent | gradle: bump dependencies (diff) | |
download | wireguard-android-d45b1ea9a754b178acd2a95705802868b8fbc8dc.tar.xz wireguard-android-d45b1ea9a754b178acd2a95705802868b8fbc8dc.zip |
QrCodeFromFileScanner: catch OOM errors
OutOfMemoryError is an Error which is a Throwable, but it isn't an
exception. Try to catch it for downscaling by catching all Throwables.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r-- | ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt b/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt index 6388ed6b..8ffd6bb4 100644 --- a/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt +++ b/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt @@ -80,7 +80,7 @@ class QrCodeFromFileScanner( scanBitmapForResult(originalBitmap).also { Log.d(TAG, "Found result in original image") } - } catch (e: Exception) { + } catch (e: Throwable) { Log.e(TAG, "Original image scan finished with error: $e, will try downscaled image") val scaleBitmap = downscaleBitmap(originalBitmap, 500) scanBitmapForResult(originalBitmap).also { scaleBitmap.recycle() } |