From 8d06b84e3fdd1b5aa32407215ebf01db58f8e7b4 Mon Sep 17 00:00:00 2001 From: RumitPatel Date: Fri, 18 Aug 2023 19:08:11 +0530 Subject: [PATCH 1/7] small compatibility changes --- app/src/main/AndroidManifest.xml | 1 + libnative/build.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dbd63f6f7..2b32ebfb0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -38,6 +38,7 @@ diff --git a/libnative/build.gradle b/libnative/build.gradle index 0f84017ae..057be4451 100644 --- a/libnative/build.gradle +++ b/libnative/build.gradle @@ -43,6 +43,7 @@ android { kotlinOptions { jvmTarget = '1.8' } + ndkVersion '25.2.9519653' } dependencies { From 663d555e803492a13e443357a47ae74734699fbf Mon Sep 17 00:00:00 2001 From: RumitPatel Date: Tue, 22 Aug 2023 17:41:58 +0530 Subject: [PATCH 2/7] - In show() method, msg updated to not nullable variable. - Warning resolved in DemoFragment.kt. - Formatted the code of ToastUtils.kt --- app/src/main/java/com/jiangdg/demo/DemoFragment.kt | 2 +- libausbc/src/main/java/com/jiangdg/ausbc/utils/ToastUtils.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/jiangdg/demo/DemoFragment.kt b/app/src/main/java/com/jiangdg/demo/DemoFragment.kt index 261ba7cb8..3b1ad583a 100644 --- a/app/src/main/java/com/jiangdg/demo/DemoFragment.kt +++ b/app/src/main/java/com/jiangdg/demo/DemoFragment.kt @@ -687,7 +687,7 @@ class DemoFragment : CameraFragment(), View.OnClickListener, CaptureMediaView.On } } catch (e: Exception) { activity?.runOnUiThread { - ToastUtils.show("${e.localizedMessage}") + ToastUtils.show(e.localizedMessage) } Logger.e(TAG, "showRecentMedia failed", e) } diff --git a/libausbc/src/main/java/com/jiangdg/ausbc/utils/ToastUtils.kt b/libausbc/src/main/java/com/jiangdg/ausbc/utils/ToastUtils.kt index f9be8dd54..6f19432b7 100644 --- a/libausbc/src/main/java/com/jiangdg/ausbc/utils/ToastUtils.kt +++ b/libausbc/src/main/java/com/jiangdg/ausbc/utils/ToastUtils.kt @@ -25,7 +25,7 @@ import androidx.annotation.MainThread */ object ToastUtils { - private var applicationCtx: Context ?= null + private var applicationCtx: Context? = null @MainThread fun init(ctx: Context) { @@ -36,7 +36,7 @@ object ToastUtils { } @JvmStatic - fun show(msg: String) { + fun show(msg: String?) { applicationCtx?.let { ctx -> Toast.makeText(ctx, msg, Toast.LENGTH_LONG).show() } @@ -48,5 +48,4 @@ object ToastUtils { Toast.makeText(ctx, ctx.getString(resId), Toast.LENGTH_LONG).show() } } - } \ No newline at end of file From 29a754d0966bde8f6b85beedee8fcad3379c6397 Mon Sep 17 00:00:00 2001 From: RumitPatel Date: Tue, 22 Aug 2023 17:46:18 +0530 Subject: [PATCH 3/7] removed unnecessary semicolon. --- .../main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libausbc/src/main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt b/libausbc/src/main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt index 2accb213a..195aba3ac 100644 --- a/libausbc/src/main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt +++ b/libausbc/src/main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt @@ -15,8 +15,8 @@ class SpaceItemDecoration(private val space: Int): RecyclerView.ItemDecoration() parent: RecyclerView, state: RecyclerView.State ) { - outRect.left = space; - outRect.bottom = space; + outRect.left = space + outRect.bottom = space if (parent.getChildLayoutPosition(view) %3==0) { outRect.left = 0 } From 62d726380129ddec4bcb2df8846b66eb11a1bcef Mon Sep 17 00:00:00 2001 From: RumitPatel Date: Tue, 22 Aug 2023 17:46:49 +0530 Subject: [PATCH 4/7] SpaceItemDecoration.kt code formatted. --- .../main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libausbc/src/main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt b/libausbc/src/main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt index 195aba3ac..7963b4fcf 100644 --- a/libausbc/src/main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt +++ b/libausbc/src/main/java/com/jiangdg/ausbc/utils/SpaceItemDecoration.kt @@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView * * @author Created by jiangdg on 2022/7/24 */ -class SpaceItemDecoration(private val space: Int): RecyclerView.ItemDecoration() { +class SpaceItemDecoration(private val space: Int) : RecyclerView.ItemDecoration() { override fun getItemOffsets( outRect: Rect, view: View, @@ -17,7 +17,7 @@ class SpaceItemDecoration(private val space: Int): RecyclerView.ItemDecoration() ) { outRect.left = space outRect.bottom = space - if (parent.getChildLayoutPosition(view) %3==0) { + if (parent.getChildLayoutPosition(view) % 3 == 0) { outRect.left = 0 } } From 4d8e37141e4d8862c7a303c9d14fe6fa9857da32 Mon Sep 17 00:00:00 2001 From: RumitPatel Date: Tue, 22 Aug 2023 17:48:08 +0530 Subject: [PATCH 5/7] SettableFuture.kt code formatted. --- .../main/java/com/jiangdg/ausbc/utils/SettableFuture.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libausbc/src/main/java/com/jiangdg/ausbc/utils/SettableFuture.kt b/libausbc/src/main/java/com/jiangdg/ausbc/utils/SettableFuture.kt index f0468fc12..46825380a 100644 --- a/libausbc/src/main/java/com/jiangdg/ausbc/utils/SettableFuture.kt +++ b/libausbc/src/main/java/com/jiangdg/ausbc/utils/SettableFuture.kt @@ -15,7 +15,11 @@ */ package com.jiangdg.ausbc.utils -import java.util.concurrent.* +import java.util.concurrent.CancellationException +import java.util.concurrent.ExecutionException +import java.util.concurrent.Future +import java.util.concurrent.TimeUnit +import java.util.concurrent.TimeoutException import java.util.concurrent.locks.AbstractQueuedSynchronizer /** Sync read tool @@ -99,10 +103,12 @@ open class SettableFuture : Future { } else { value } + CANCELLED, INTERRUPTED -> throw cancellationExceptionWithCause( "Task was cancelled.", exception ) + else -> throw IllegalStateException("Error, synchronizer in invalid state: $state") } } From 98a153331f084069ba64af1a83046f7440cf3004 Mon Sep 17 00:00:00 2001 From: RumitPatel Date: Tue, 22 Aug 2023 17:49:52 +0530 Subject: [PATCH 6/7] Removed unnecessary semicolon from CrashUtils.kt --- libausbc/src/main/java/com/jiangdg/ausbc/utils/CrashUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libausbc/src/main/java/com/jiangdg/ausbc/utils/CrashUtils.kt b/libausbc/src/main/java/com/jiangdg/ausbc/utils/CrashUtils.kt index 1d3d20178..677b3c25f 100644 --- a/libausbc/src/main/java/com/jiangdg/ausbc/utils/CrashUtils.kt +++ b/libausbc/src/main/java/com/jiangdg/ausbc/utils/CrashUtils.kt @@ -41,8 +41,8 @@ object CrashUtils : Thread.UncaughtExceptionHandler { fun init(application: Application) { this.mApplication = application - mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler(); - Thread.setDefaultUncaughtExceptionHandler(this); + mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler() + Thread.setDefaultUncaughtExceptionHandler(this) } override fun uncaughtException(t: Thread, e: Throwable) { From 81ffecac14d8a1e206a01483c153706b8b9e0238 Mon Sep 17 00:00:00 2001 From: RumitPatel Date: Thu, 31 Aug 2023 12:46:15 +0530 Subject: [PATCH 7/7] Static ndk removed. --- libnative/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/libnative/build.gradle b/libnative/build.gradle index 057be4451..0f84017ae 100644 --- a/libnative/build.gradle +++ b/libnative/build.gradle @@ -43,7 +43,6 @@ android { kotlinOptions { jvmTarget = '1.8' } - ndkVersion '25.2.9519653' } dependencies {