5.2.1

regulaforensics · Oct 18, 2020 · f128109 · f128109
1 parent 85de276
commit f128109
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/example/package.json b/example/package.json
@@ -16,7 +16,7 @@
     "cordova-android": "^9.0.0",
     "cordova-ios": "^6.1.1",
     "cordova-plugin-add-swift-support": "^2.0.2",
-    "@regulaforensics/cordova-plugin-document-reader-api": "^5.2.0",
+    "@regulaforensics/cordova-plugin-document-reader-api": "^5.2.1",
     "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^5.2.0",
     "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-image-picker": "^1.1.3",
@@ -44,4 +44,4 @@
   "devDependencies": {
     "cordova-plugin-whitelist": "^1.3.4"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/cordova-plugin-document-reader-api",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "description": "Cordova plugin for reading and validation of identification documents (API framework)",
   "cordova": {
     "id": "@regulaforensics/cordova-plugin-document-reader-api",

diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-document-reader-api" version="5.2.0"
+<plugin id="cordova-plugin-document-reader-api" version="5.2.1"
   xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>

diff --git a/src/android/DocumentReader.java b/src/android/DocumentReader.java
@@ -282,7 +282,6 @@ public void error(String s) {
         return true;
     }
 
-<<<<<<< HEAD
     private void startForegroundDispatch(final Activity activity) {
         IntentFilter[] filters = new IntentFilter[1];
         filters[0] = new IntentFilter();
@@ -304,8 +303,6 @@ private void stopBackgroundRFID() {
         backgroundRFIDEnabled = false;
     }
 
-=======
->>>>>>> master
     private void getAvailableScenarios(Callback callback) throws JSONException {
         callback.success(JSONConstructor.generateList(Instance().availableScenarios, JSONConstructor::generateDocumentReaderScenario, getContext()).toString());
     }