@@ -24,12 +24,14 @@ import com.regula.documentreader.api.enums.DocReaderAction
2424import com.regula.documentreader.api.enums.eGraphicFieldType
2525import com.regula.documentreader.api.enums.eVisualFieldType
2626import com.regula.documentreader.api.errors.DocumentReaderException
27+ import com.regula.documentreader.api.params.DocReaderConfig
2728import com.regula.documentreader.api.results.DocumentReaderResults
2829import com.regula.documentreader.api.results.DocumentReaderScenario
2930import java.io.FileNotFoundException
3031import java.io.InputStream
3132import java.util.*
3233
34+
3335class MainActivity : AppCompatActivity () {
3436 private var nameTv: TextView ? = null
3537 private var showScanner: TextView ? = null
@@ -169,64 +171,64 @@ class MainActivity : AppCompatActivity() {
169171 }
170172 scenarioLv!! .onItemClickListener =
171173 OnItemClickListener { adapterView: AdapterView <* >, _: View ? , i: Int , _: Long ->
172- if (! DocumentReader .Instance ().documentReaderIsReady ) return @OnItemClickListener
174+ if (! DocumentReader .Instance ().isReady ) return @OnItemClickListener
173175 val adapter = adapterView.adapter as ScenarioAdapter
174176
175177 // setting selected scenario to DocumentReader params
176- DocumentReader .Instance ().processParams().scenario = adapter.getItem(i)
178+ DocumentReader .Instance ().processParams().scenario = adapter.getItem(i)!!
177179 adapter.setSelectedPosition(i)
178180 adapter.notifyDataSetChanged()
179181 }
180182 showCameraActivity!! .setOnClickListener { _: View ? ->
181- if (! DocumentReader .Instance ().documentReaderIsReady ) return @setOnClickListener
183+ if (! DocumentReader .Instance ().isReady ) return @setOnClickListener
182184 val cameraIntent = Intent ()
183185 cameraIntent.setClass(this @MainActivity, CameraActivity ::class .java)
184186 startActivity(cameraIntent)
185187 }
186188 }
187189
188190 private fun initializeReader (initDialog : AlertDialog ) {
189- // Initializing the reader
190- getLicense(this )?.let {
191- DocumentReader .Instance ().initializeReader(
192- this @MainActivity,
193- it
194- ) { success, error ->
195- if (initDialog.isShowing) {
196- initDialog.dismiss()
197- }
198- if (! success) { // Initialization was not successful
199- Toast .makeText(this @MainActivity, " Init failed:$error " , Toast .LENGTH_LONG ).show()
200- return @initializeReader
201- }
202- setupCustomization()
203- setupFunctionality()
204-
205- // initialization successful
206- if (DocumentReader .Instance ().isRFIDAvailableForUse) {
207- // reading shared preferences
208- doRfid = sharedPreferences!! .getBoolean(DO_RFID , false )
209- doRfidCb!! .isChecked = doRfid
210- doRfidCb!! .setOnCheckedChangeListener(CompoundButton .OnCheckedChangeListener { compoundButton, checked ->
211- doRfid = checked
212- sharedPreferences!! .edit().putBoolean(DO_RFID , checked).apply ()
213- })
214- } else {
215- doRfidCb!! .visibility = View .GONE
216- }
191+ val config = DocReaderConfig (getLicense(this ))
192+ config.isLicenseUpdate = true
217193
218- // getting current processing scenario and loading available scenarios to ListView
219- val scenarios = ArrayList <String >()
220- for (scenario: DocumentReaderScenario in DocumentReader .Instance ().availableScenarios) {
221- scenarios.add(scenario.name)
222- }
194+ DocumentReader .Instance ().initializeReader(
195+ this @MainActivity,
196+ config
197+ ) { success, error ->
198+ if (initDialog.isShowing) {
199+ initDialog.dismiss()
200+ }
201+ if (! success) { // Initialization was not successful
202+ Toast .makeText(this @MainActivity, " Init failed:$error " , Toast .LENGTH_LONG ).show()
203+ return @initializeReader
204+ }
205+ setupCustomization()
206+ setupFunctionality()
223207
224- // setting default scenario
225- DocumentReader .Instance ().processParams().scenario = scenarios[0 ]
226- val adapter =
227- ScenarioAdapter (this @MainActivity, android.R .layout.simple_list_item_1, scenarios)
228- scenarioLv!! .adapter = adapter
208+ // initialization successful
209+ if (DocumentReader .Instance ().isRFIDAvailableForUse) {
210+ // reading shared preferences
211+ doRfid = sharedPreferences!! .getBoolean(DO_RFID , false )
212+ doRfidCb!! .isChecked = doRfid
213+ doRfidCb!! .setOnCheckedChangeListener(CompoundButton .OnCheckedChangeListener { compoundButton, checked ->
214+ doRfid = checked
215+ sharedPreferences!! .edit().putBoolean(DO_RFID , checked).apply ()
216+ })
217+ } else {
218+ doRfidCb!! .visibility = View .GONE
229219 }
220+
221+ // getting current processing scenario and loading available scenarios to ListView
222+ val scenarios = ArrayList <String >()
223+ for (scenario: DocumentReaderScenario in DocumentReader .Instance ().availableScenarios) {
224+ scenarios.add(scenario.name)
225+ }
226+
227+ // setting default scenario
228+ DocumentReader .Instance ().processParams().scenario = scenarios[0 ]
229+ val adapter =
230+ ScenarioAdapter (this @MainActivity, android.R .layout.simple_list_item_1, scenarios)
231+ scenarioLv!! .adapter = adapter
230232 }
231233 }
232234
0 commit comments