Skip to content

Commit c971769

Browse files
committed
fix build process
1 parent 094e284 commit c971769

3 files changed

Lines changed: 22 additions & 22 deletions

File tree

Samples/Advanced/DocumentReader-Kotlin/app/src/main/java/com/regula/documentreader/Helpers.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ class Helpers {
6060
"Capture frame" to 2
6161
)
6262

63-
fun <T> listToString(list: List<T>, context: Context?): String {
64-
if (list.isEmpty())
63+
fun <T> listToString(list: List<T>?, context: Context?): String {
64+
if (list?.isEmpty() == true)
6565
return context!!.resources.getString(R.string.string_default)
6666
return list.toString().removeSurrounding("[", "]")
6767
}

Samples/Advanced/DocumentReader-Kotlin/app/src/main/java/com/regula/documentreader/MainActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ class MainActivity : FragmentActivity(), Serializable {
141141
}
142142

143143
private fun onInitComplete() {
144-
var currentScenario: String? = Instance().processParams().scenario
144+
var currentScenario = Instance().processParams().scenario
145145
val scenarios: Array<String?> = arrayOfNulls(Instance().availableScenarios.size)
146146
for ((i, scenario) in Instance().availableScenarios.withIndex())
147147
scenarios[i] = scenario.name
148-
if (currentScenario == null || currentScenario.isEmpty()) {
149-
currentScenario = scenarios[0]
148+
if (currentScenario.isEmpty()) {
149+
currentScenario = scenarios[0] ?: ""
150150
Instance().processParams().scenario = currentScenario
151151
}
152152
binding.scenarioPicker.visibility = View.VISIBLE
@@ -156,7 +156,7 @@ class MainActivity : FragmentActivity(), Serializable {
156156
binding.scenarioPicker.value = scenarios.indexOf(currentScenario)
157157
binding.scenarioPicker.setOnValueChangedListener { _, _, newVal ->
158158
binding.scenarioPicker.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
159-
Instance().processParams().scenario = scenarios[newVal]
159+
Instance().processParams().scenario = scenarios[newVal] ?: ""
160160
}
161161

162162
binding.recyclerView.visibility = View.VISIBLE

Samples/Advanced/DocumentReader-Kotlin/app/src/main/java/com/regula/documentreader/SettingsActivity.kt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ class APISettingsFragment : Fragment() {
289289
Stepper(
290290
"DPI threshold",
291291
"",
292-
{ Instance().processParams().imageQA.dpiThreshold },
293-
{ Instance().processParams().imageQA.dpiThreshold = it },
292+
{ Instance().processParams().imageQA?.dpiThreshold },
293+
{ Instance().processParams().imageQA?.dpiThreshold = it },
294294
step = 25,
295295
addMinusOne = true
296296
)
@@ -299,33 +299,33 @@ class APISettingsFragment : Fragment() {
299299
Stepper(
300300
"Angle threshold",
301301
"",
302-
{ Instance().processParams().imageQA.angleThreshold },
303-
{ Instance().processParams().imageQA.angleThreshold = it },
302+
{ Instance().processParams().imageQA?.angleThreshold },
303+
{ Instance().processParams().imageQA?.angleThreshold = it },
304304
)
305305
)
306306
sectionsData.add(
307307
Switch(
308308
"Focus check",
309-
{ Instance().processParams().imageQA.focusCheck },
310-
{ Instance().processParams().imageQA.focusCheck = it })
309+
{ Instance().processParams().imageQA?.focusCheck },
310+
{ Instance().processParams().imageQA?.focusCheck = it })
311311
)
312312
sectionsData.add(
313313
Switch(
314314
"Glares check",
315-
{ Instance().processParams().imageQA.glaresCheck },
316-
{ Instance().processParams().imageQA.glaresCheck = it })
315+
{ Instance().processParams().imageQA?.glaresCheck },
316+
{ Instance().processParams().imageQA?.glaresCheck = it })
317317
)
318318
sectionsData.add(
319319
Switch(
320320
"Colorness check",
321-
{ Instance().processParams().imageQA.colornessCheck },
322-
{ Instance().processParams().imageQA.colornessCheck = it })
321+
{ Instance().processParams().imageQA?.colornessCheck },
322+
{ Instance().processParams().imageQA?.colornessCheck = it })
323323
)
324324
sectionsData.add(
325325
Switch(
326326
"Moire check",
327-
{ Instance().processParams().imageQA.moireCheck },
328-
{ Instance().processParams().imageQA.moireCheck = it })
327+
{ Instance().processParams().imageQA?.moireCheck },
328+
{ Instance().processParams().imageQA?.moireCheck = it })
329329
)
330330
sectionsData.add(Section("Restrictions"))
331331
sectionsData.add(
@@ -523,9 +523,9 @@ class APISettingsFragment : Fragment() {
523523
InputString(
524524
"Document ID List",
525525
{
526-
if (Instance().processParams().documentIDList == null || Instance().processParams().documentIDList.isEmpty())
526+
if (Instance().processParams().documentIDList == null || Instance().processParams().documentIDList?.isEmpty() == true)
527527
return@InputString ""
528-
listToString(Instance().processParams().documentIDList.toList(), context)
528+
listToString(Instance().processParams().documentIDList?.toList(), context)
529529
},
530530
{
531531
try {
@@ -538,9 +538,9 @@ class APISettingsFragment : Fragment() {
538538
InputString(
539539
"Field type filter",
540540
{
541-
if (Instance().processParams().fieldTypesFilter == null || Instance().processParams().fieldTypesFilter.isEmpty())
541+
if (Instance().processParams().fieldTypesFilter == null || Instance().processParams().fieldTypesFilter?.isEmpty() == true)
542542
return@InputString ""
543-
listToString(Instance().processParams().fieldTypesFilter.toList(), context)
543+
listToString(Instance().processParams().fieldTypesFilter?.toList(), context)
544544
},
545545
{
546546
try {

0 commit comments

Comments
 (0)