Improve native load

Nain57 · Nov 25, 2023 · a223379 · a223379
1 parent 7fc9f8b
commit a223379
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/core/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/NativeDetector.kt b/core/detection/src/main/java/com/buzbuz/smartautoclicker/core/detection/NativeDetector.kt
@@ -27,12 +27,14 @@ import androidx.annotation.Keep
  * Debug flavour of the library is build against build artifacts of OpenCv in the debug folder.
  * Release flavour of the library is build against the sources of the OpenCv project, downloaded from github.
  */
-class NativeDetector : ImageDetector {
+class NativeDetector private constructor() : ImageDetector {
 
     companion object {
-        // Used to load the 'smartautoclicker' library on application startup.
-        init {
+        fun newInstance(): NativeDetector? = try {
             System.loadLibrary("smartautoclicker")
+            NativeDetector()
+        } catch (ex: UnsatisfiedLinkError) {
+            null
         }
     }
 

diff --git a/...ocessing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/DetectorEngine.kt b/...ocessing/src/main/java/com/buzbuz/smartautoclicker/core/processing/data/DetectorEngine.kt
@@ -161,9 +161,8 @@ internal class DetectorEngine(context: Context) {
             return
         }
 
-        val detector = try {
-            NativeDetector()
-        } catch (ex: UnsatisfiedLinkError) {
+        val detector = NativeDetector.newInstance()
+        if (detector == null) {
             Log.e(TAG, "startDetection: native library not found.")
             _state.value = DetectorState.ERROR_NATIVE_DETECTOR_LIB_NOT_FOUND
             return