Skip to content

Commit 8cca2fc

Browse files
committed
fixed ocr module
1 parent 6263bc0 commit 8cca2fc

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

classic-components-example/ocr/src/main/java/io/scanbot/example/ExampleApplication.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package io.scanbot.example
22

33
import android.app.Application
44
import io.scanbot.example.common.getAppStorageDir
5-
import io.scanbot.sap.SdkFeature
65
import io.scanbot.sdk.ScanbotSDK
76
import io.scanbot.sdk.ScanbotSDKInitializer
87
import io.scanbot.sdk.util.log.LoggerProvider
@@ -35,11 +34,9 @@ class ExampleApplication : Application(), CoroutineScope {
3534
.withLogging(true)
3635
// TODO 2/2: Enable the Scanbot SDK license key
3736
//.license(this, licenseKey)
38-
.licenceErrorHandler { status, feature, statusMessage ->
37+
.licenseErrorHandler { status, feature, statusMessage ->
3938
LoggerProvider.logger.d("ExampleApplication", "+++> License status: ${status.name}. Status message: $statusMessage")
40-
if (feature != SdkFeature.NoSdkFeature) {
41-
LoggerProvider.logger.d("ExampleApplication", "+++> Feature not available: ${feature.name}")
42-
}
39+
LoggerProvider.logger.d("ExampleApplication", "+++> Feature not available: ${feature.name}")
4340
}
4441
//.sdkFilesDirectory(this, getExternalFilesDir(null)!!)
4542
.prepareOCRLanguagesBlobs(true)
@@ -50,7 +47,7 @@ class ExampleApplication : Application(), CoroutineScope {
5047
val licenseInfo = ScanbotSDK(this).licenseInfo
5148
LoggerProvider.logger.d("ExampleApplication", "License status: ${licenseInfo.status}")
5249
LoggerProvider.logger.d("ExampleApplication", "License isValid: ${licenseInfo.isValid}")
53-
LoggerProvider.logger.d("ExampleApplication", "License expirationDate: ${licenseInfo.expirationDate}")
50+
LoggerProvider.logger.d("ExampleApplication", "License expirationDate: ${licenseInfo.expirationDateString}")
5451

5552
launch {
5653
getAppStorageDir(this@ExampleApplication).deleteRecursively()

classic-components-example/ocr/src/main/java/io/scanbot/example/MainActivity.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ import androidx.activity.result.PickVisualMediaRequest
99
import androidx.activity.result.contract.ActivityResultContracts
1010
import androidx.appcompat.app.AppCompatActivity
1111
import androidx.lifecycle.lifecycleScope
12+
import io.scanbot.common.getOrNull
13+
import io.scanbot.common.getOrThrow
1214
import io.scanbot.example.common.Const
1315
import io.scanbot.example.common.applyEdgeToEdge
1416
import io.scanbot.example.common.showToast
1517
import io.scanbot.example.databinding.ActivityMainBinding
16-
import io.scanbot.pdf.model.PageSize
17-
import io.scanbot.pdf.model.PdfConfiguration
1818
import io.scanbot.sdk.ScanbotSDK
1919
import io.scanbot.sdk.docprocessing.Document
2020
import io.scanbot.sdk.ocr.OcrEngine
21+
import io.scanbot.sdk.ocr.OcrEngineManager
2122
import kotlinx.coroutines.Dispatchers
2223
import kotlinx.coroutines.launch
2324
import kotlinx.coroutines.withContext
@@ -26,7 +27,7 @@ class MainActivity : AppCompatActivity() {
2627

2728
private val binding by lazy { ActivityMainBinding.inflate(layoutInflater) }
2829
private val scanbotSdk: ScanbotSDK by lazy { ScanbotSDK(this) }
29-
private val opticalCharacterRecognizer: OcrEngine by lazy { scanbotSdk.createOcrEngine() }
30+
private val opticalCharacterRecognizer: OcrEngineManager by lazy { scanbotSdk.createOcrEngineManager() }
3031

3132

3233
private val selectGalleryImageResultLauncher =
@@ -73,11 +74,12 @@ class MainActivity : AppCompatActivity() {
7374
private suspend fun recognizeTextWithoutPDF(document: Document) {
7475
val ocrResult = withContext(Dispatchers.Default) {
7576
opticalCharacterRecognizer.recognizeFromUris(document.pages.map { it.documentFileUri })
77+
.getOrThrow()
7678
}
7779

7880
withContext(Dispatchers.Main) {
7981
ocrResult.let {
80-
if (it.ocrPages.isNotEmpty()) {
82+
if (it.ocrPages!!.isNotEmpty()) {
8183
this@MainActivity.showToast("Recognized page content: ${it.recognizedText.trimIndent()}")
8284
}
8385
}

0 commit comments

Comments
 (0)