8.1.306

Author: Jenkins

.dart_tool/package_config.json

@@ -158,7 +158,7 @@
       "languageVersion": "3.1"
     }
   ],
-  "generated": "2025-06-05T13:05:01.191685Z",
+  "generated": "2025-06-18T15:00:23.898723Z",
   "generator": "pub",
   "generatorVersion": "3.7.2",
   "flutterRoot": "file:///Users/administratorregula/development/flutter",

android/build.gradle

@@ -1,25 +1,34 @@
+rootProject.allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url "https://maven.regulaforensics.com/RegulaDocumentReader"
+        }
+    }
+}
+
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    // Conditional for compatibility with AGP <4.2.
-    if (project.android.hasProperty("namespace")) {
-        namespace 'io.flutter.plugins.regula.documentreader.flutter_document_reader_api'
+    namespace 'com.regula.plugin.documentreader'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 21
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
-
-    compileSdk 34
-    
-    defaultConfig {
-        minSdk 21
+    kotlinOptions {
+        jvmTarget = '11'
     }
 
     dependencies {
-        implementation('com.regula.documentreader:api:7.7.11452') {
+        implementation('com.regula.documentreader:api:8.1.11551') {
             transitive = true
         }
 
@@ -43,13 +52,3 @@ android {
         }
     }
 }
-
-rootProject.allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven {
-            url "https://maven.regulaforensics.com/RegulaDocumentReader"
-        }
-    }
-}

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,13 +1,4 @@
-//
-//  BluetoothUtil.kt
-//  DocumentReader
-//
-//  Created by Pavel Masiuk on 21.09.2023.
-//  Copyright © 2023 Regula. All rights reserved.
-//
-@file:SuppressLint("MissingPermission")
-
-package io.flutter.plugins.regula.documentreader.flutter_document_reader_api
+package com.regula.plugin.documentreader
 
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.Manifest.permission.BLUETOOTH_CONNECT
@@ -22,6 +13,7 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.IBinder
 import android.provider.Settings
+import android.util.Log
 import androidx.core.content.ContextCompat.checkSelfPermission
 import com.regula.common.ble.BLEWrapper
 import com.regula.common.ble.BleWrapperCallback
@@ -38,45 +30,41 @@ const val INTENT_REQUEST_ENABLE_LOCATION = 196
 const val INTENT_REQUEST_ENABLE_BLUETOOTH = 197
 
 @SuppressLint("StaticFieldLeak")
-lateinit var bluetooth: BLEWrapper
+var bluetooth: BLEWrapper? = null
 lateinit var savedCallbackForPermissionResult: Callback
-var deviceConnected = false
 
 fun connectBluetoothDevice(callback: Callback) {
-    // return if already connected
-    if (deviceConnected) return
+    if (bluetooth?.isConnected == true) {
+        Log.e("REGULA", "Bluetooth device already connected, returning false")
+        callback(false)
+        return
+    }
 
-    // If some of the bluetooth permissions/settings don't match the requirements,
-    // save callback for later and request the permissions/settings.
-    // Callback will then be used in onRequestPermissionsResult for permission requests
-    // and in onActivityResult for settings change requests.
     if (!isBluetoothSettingsReady(activity)) {
         savedCallbackForPermissionResult = callback
         return
     }
 
-    // set searching timeout
-    val timer = object : TimerTask() {
+    val timeout = object : TimerTask() {
         override fun run() {
-            callback.success(false)
-            bluetooth.stopDeviceScan()
-            bluetooth.disconnect()
+            callback(false)
+            bluetooth?.stopDeviceScan()
+            bluetooth?.disconnect()
         }
     }
-    Timer().schedule(timer, SEARCHING_TIMEOUT)
+    Timer().schedule(timeout, SEARCHING_TIMEOUT)
 
-    // start searching devices
     val bleIntent = Intent(context, RegulaBleService::class.java)
     context.startService(bleIntent)
     context.bindService(bleIntent, object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName, service: IBinder) {
             bluetooth = (service as RegulaBleService.LocalBinder).service.bleManager
-            bluetooth.addCallback(object : BleWrapperCallback() {
+            if (bluetooth!!.isConnected) callback(true)
+            else bluetooth!!.addCallback(object : BleWrapperCallback() {
                 override fun onDeviceReady() {
-                    timer.cancel()
-                    bluetooth.removeCallback(this)
-                    deviceConnected = true
-                    callback.success(true)
+                    timeout.cancel()
+                    bluetooth!!.removeCallback(this)
+                    callback(true)
                 }
             })
         }
@@ -92,7 +80,7 @@ fun onRequestPermissionsResult(
 ): Boolean {
     if (requestCode != BLE_ACCESS_PERMISSION || permissions.isEmpty()) return false
     if (grantResults.isEmpty() || grantResults[0] != PERMISSION_GRANTED) {
-        savedCallbackForPermissionResult.success(false)
+        savedCallbackForPermissionResult(false)
         return true
     }
     connectBluetoothDevice(savedCallbackForPermissionResult)
@@ -109,7 +97,7 @@ fun onActivityResult(requestCode: Int, rc: Int, @Suppress("UNUSED_PARAMETER") da
         if (resultCode == Activity.RESULT_OK)
             connectBluetoothDevice(savedCallbackForPermissionResult)
         else
-            savedCallbackForPermissionResult.success(false)
+            savedCallbackForPermissionResult(false)
         return true
     }
     return false