Skip to content

Commit 63ab080

Browse files
committed
refactor: remove unused items and refactor enums
1 parent e0914ad commit 63ab080

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

android/src/main/java/com/reactnativeidscansdk/IdscanSdkModule.kt

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.reactnativeidscansdk
22

33
import android.Manifest
4-
import android.R.attr
54
import android.app.Activity
65
import android.content.Intent
76
import android.content.pm.PackageManager
@@ -20,7 +19,6 @@ import net.idscan.components.android.multiscan.components.mrz.MRZData
2019
import net.idscan.components.android.multiscan.components.pdf417.PDF417Component
2120
import net.idscan.components.android.multiscan.components.pdf417.PDF417Data
2221

23-
2422
@ReactModule(name = IdscanSdkModule.NAME)
2523
class IdscanSdkModule(reactContext: ReactApplicationContext) :
2624
ReactContextBaseJavaModule(reactContext), PermissionListener {
@@ -29,6 +27,7 @@ class IdscanSdkModule(reactContext: ReactApplicationContext) :
2927
private var scannerPDFKey: String? = null
3028
private var scannerMRZKey: String? = null
3129
private var parserKey: String? = null
30+
3231
private val mActivityEventListener: ActivityEventListener =
3332
object : BaseActivityEventListener() {
3433
override fun onActivityResult(
@@ -41,10 +40,12 @@ class IdscanSdkModule(reactContext: ReactApplicationContext) :
4140
if (requestCode == SCAN_ACTIVITY_CODE) {
4241
var errorMessage = ""
4342
val scanResult = Arguments.createMap()
43+
4444
when (resultCode) {
4545
MultiScanActivity.RESULT_OK -> if (data != null) {
4646
val document =
4747
data.getSerializableExtra(MultiScanActivity.DOCUMENT_DATA) as DocumentData?
48+
4849
if (document != null) {
4950
val mrzData = MRZComponent.extractDataFromDocument(document)
5051
val pdf417Data = PDF417Component.extractDataFromDocument(document)
@@ -62,20 +63,15 @@ class IdscanSdkModule(reactContext: ReactApplicationContext) :
6263
errorMessage = e.message!!
6364
}
6465
}
65-
else -> {
66-
scanResult.putBoolean("success", false)
67-
}
66+
else -> scanResult.putBoolean("success", false)
6867
}
6968
}
7069
}
7170
MultiScanActivity.ERROR_RECOGNITION -> errorMessage =
7271
data?.getStringExtra(MultiScanActivity.ERROR_DESCRIPTION).toString()
73-
MultiScanActivity.ERROR_INVALID_CAMERA_NUMBER -> errorMessage =
74-
"Invalid camera number."
75-
MultiScanActivity.ERROR_CAMERA_NOT_AVAILABLE -> errorMessage =
76-
"Camera not available."
77-
MultiScanActivity.ERROR_INVALID_CAMERA_ACCESS -> errorMessage =
78-
"Invalid camera access."
72+
MultiScanActivity.ERROR_INVALID_CAMERA_NUMBER -> errorMessage = "Invalid camera number."
73+
MultiScanActivity.ERROR_CAMERA_NOT_AVAILABLE -> errorMessage = "Camera not available."
74+
MultiScanActivity.ERROR_INVALID_CAMERA_ACCESS -> errorMessage = "Invalid camera access."
7975
MultiScanActivity.RESULT_CANCELED -> {
8076
Log.d(NAME, "Cancelled IdScanner")
8177
val emptyData = Arguments.createMap() as ReadableMap
@@ -187,16 +183,16 @@ class IdscanSdkModule(reactContext: ReactApplicationContext) :
187183

188184
override fun getConstants(): Map<String, Any> {
189185
val constants: MutableMap<String, Any> = HashMap()
190-
constants["TYPE_COMBINED"] = typeCombined
191-
constants["TYPE_MRZ"] = typeMRZ
192-
constants["TYPE_PDF"] = typePDF
186+
constants["TYPE_COMBINED"] = TYPE_COMBINED
187+
constants["TYPE_MRZ"] = TYPE_MRZ
188+
constants["TYPE_PDF"] = TYPE_PDF
193189
return constants
194190
}
195191

196192
companion object {
197-
const val typeCombined = "combined"
198-
const val typeMRZ = "mrz"
199-
const val typePDF = "pdf"
193+
private const val TYPE_COMBINED = "combined"
194+
private const val TYPE_MRZ = "mrz"
195+
private const val TYPE_PDF = "pdf"
200196

201197
private const val SCAN_ACTIVITY_CODE = 0x001
202198
private const val REQUEST_CAMERA_PERMISSIONS_DEFAULT = 0x100
@@ -205,9 +201,6 @@ class IdscanSdkModule(reactContext: ReactApplicationContext) :
205201
private const val KEY_MRZ_KEY = "androidDetectorMRZLicenseKey"
206202
private const val KEY_PARSER_KEY = "androidParserPDFLicenseKey"
207203

208-
private val permissions =
209-
arrayOf(Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE)
210-
211204
const val NAME = "IdscanSdk"
212205
}
213206

0 commit comments

Comments
 (0)