Skip to content

Commit 7430832

Browse files
committed
Updated projects to SDK v5.4
1 parent fa74eb4 commit 7430832

5 files changed

Lines changed: 14 additions & 9 deletions

File tree

Samples/DocumentReader-sample/app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ android {
2929

3030
dependencies {
3131
implementation fileTree(dir: 'libs', include: ['*.jar'])
32+
//noinspection GradleCompatible
3233
implementation 'com.android.support:appcompat-v7:27.1.1'
3334
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
3435

3536
testImplementation 'junit:junit:4.12'
3637
androidTestImplementation 'com.android.support.test:runner:1.0.2'
3738
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
3839

39-
implementation 'com.regula.documentreader.fullrfid:core:5.3.+@aar'
40-
implementation('com.regula.documentreader:api:5.3.+@aar') {
40+
implementation 'com.regula.documentreader.fullrfid:core:5.4.+@aar'
41+
implementation('com.regula.documentreader:api:5.4.+@aar') {
4142
transitive = true;
4243
}
4344
}

Samples/DocumentReader-sample/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package="com.regula.documentreader">
44

55
<uses-permission android:name="android.permission.NFC" />
6+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
67

78
<application
89
android:allowBackup="true"

Samples/DocumentReader-sample/app/src/main/java/com/regula/documentreader/MainActivity.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.regula.documentreader.api.enums.eGraphicFieldType;
3838
import com.regula.documentreader.api.enums.eRFID_Password_Type;
3939
import com.regula.documentreader.api.enums.eVisualFieldType;
40+
import com.regula.documentreader.api.errors.DocumentReaderException;
4041
import com.regula.documentreader.api.results.DocumentReaderResults;
4142
import com.regula.documentreader.api.results.DocumentReaderScenario;
4243
import com.regula.documentreader.api.results.DocumentReaderTextField;
@@ -114,12 +115,12 @@ public void onPrepareProgressChanged(int progress) {
114115
}
115116

116117
@Override
117-
public void onPrepareCompleted(boolean status, Throwable error) {
118+
public void onPrepareCompleted(boolean status, DocumentReaderException error) {
118119

119120
//Initializing the reader
120121
DocumentReader.Instance().initializeReader(MainActivity.this, license, new IDocumentReaderInitCompletion() {
121122
@Override
122-
public void onInitCompleted(boolean success, Throwable error) {
123+
public void onInitCompleted(boolean success, DocumentReaderException error) {
123124
if (initDialog.isShowing()) {
124125
initDialog.dismiss();
125126
}
@@ -276,7 +277,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
276277
//DocumentReader processing callback
277278
private IDocumentReaderCompletion completion = new IDocumentReaderCompletion() {
278279
@Override
279-
public void onCompleted(int action, DocumentReaderResults results, Throwable error) {
280+
public void onCompleted(int action, DocumentReaderResults results, DocumentReaderException error) {
280281
//processing is finished, all results are ready
281282
if (action == DocReaderAction.COMPLETE) {
282283
if(loadingDialog!=null && loadingDialog.isShowing()){
@@ -300,7 +301,7 @@ public void onCompleted(int action, DocumentReaderResults results, Throwable err
300301
//starting chip reading
301302
DocumentReader.Instance().startRFIDReader(MainActivity.this, new IDocumentReaderCompletion() {
302303
@Override
303-
public void onCompleted(int rfidAction, DocumentReaderResults results, Throwable error) {
304+
public void onCompleted(int rfidAction, DocumentReaderResults results, DocumentReaderException error) {
304305
if (rfidAction == DocReaderAction.COMPLETE || rfidAction == DocReaderAction.CANCEL) {
305306
displayResults(results);
306307
}

Samples/DocumentReader-sample_kotlin/app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ android {
3232
dependencies {
3333
implementation fileTree(dir: 'libs', include: ['*.jar'])
3434
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
35+
//noinspection GradleCompatible
3536
implementation 'com.android.support:appcompat-v7:28.0.0'
3637
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
3738

3839
testImplementation 'junit:junit:4.12'
3940
androidTestImplementation 'com.android.support.test:runner:1.0.2'
4041
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
4142

42-
implementation 'com.regula.documentreader.fullrfid:core:5.3.+@aar'
43-
implementation('com.regula.documentreader:api:5.3.+@aar') {
43+
implementation 'com.regula.documentreader.fullrfid:core:5.4.+@aar'
44+
implementation('com.regula.documentreader:api:5.4.+@aar') {
4445
transitive = true;
4546
}
4647
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import com.regula.documentreader.api.enums.DocReaderAction
2727
import com.regula.documentreader.api.enums.eGraphicFieldType
2828
import com.regula.documentreader.api.enums.eRFID_Password_Type
2929
import com.regula.documentreader.api.enums.eVisualFieldType
30+
import com.regula.documentreader.api.errors.DocumentReaderException
3031
import com.regula.documentreader.api.results.DocumentReaderResults
3132
import kotlinx.android.synthetic.main.activity_main.*
3233
import java.io.FileNotFoundException
@@ -138,7 +139,7 @@ class MainActivity : AppCompatActivity() {
138139
initDialog.setTitle("Downloading database: $progress%")
139140
}
140141

141-
override fun onPrepareCompleted(status: Boolean, error: Throwable?) {
142+
override fun onPrepareCompleted(status: Boolean, error: DocumentReaderException?) {
142143

143144
//Initializing the reader
144145
DocumentReader.Instance().initializeReader(

0 commit comments

Comments
 (0)