Merge pull request #9 from SocketMobile/version-1.4.32

updated logic for v1.4.32

Author: sdksupport-socketmobile

README.md

@@ -1,4 +1,4 @@
-# react-native-capture 1.4.23
+# react-native-capture 1.4.32
 
 This react native module allows a React Native application to use and control Socket Mobile wireless barcode scanners, NFC Reader/Writer, and Camera (iOS only) to capture and deliver data capture to such application.
 
@@ -198,7 +198,26 @@ const App = () => {
 };
 ```
 
-## Upgrading to iOS SDK Version 1.6.39
+## Referencing Socket Mobile's Android SDK
+
+In version `>1.4.23`, we are removing the `android/libs` folder and it's contents. This is because we are now referencing the Socket Mobile Android SDK via the release repo. The developer will need to add two things. First, in their `build.gradle` file, add the below code, in the `repositories` section.
+
+```
+  maven {
+          url "https://bin.socketmobile.com/repo/releases"
+      }
+```
+
+Next, in their `app/gradle.build` file, they will need to add the below code.
+
+```
+  packagingOptions {
+        pickFirst '/lib/arm64-v8a/libc++_shared.so'
+        pickFirst '/lib/armeabi-v7a/libc++_shared.so'
+    }
+```
+
+## Upgrading to iOS SDK Version 1.8.34
 
 I needed to deintegrate pods and then re-install them using `pod install --repo-update`. Doing a regular `pod install` gave me the error the below error.
 

android/build.gradle

@@ -68,9 +68,10 @@ repositories {
 
 dependencies {
     //noinspection GradleDynamicVersion
-    implementation fileTree(dir: "libs", include: ["*.aar", "*.jar"])
+    // implementation fileTree(dir: "libs", include: ["*.aar", "*.jar"])
     implementation 'com.facebook.react:react-native:+'  // From node_modules
     implementation 'com.google.zxing:core:3.5.1'
+    implementation 'com.socketmobile:capture-socketcam:1.7.39'
 }
 
 def configureReactNativePom(def pom) {

android/src/main/java/com/socketmobile/CaptureModule.java

@@ -19,6 +19,7 @@
 import com.socketmobile.capture.client.ConnectionState;
 import com.socketmobile.capture.CaptureError;
 import com.socketmobile.capture.troy.ExtensionScope;
+import com.socketmobile.CaptureService;
 
 import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;
 
@@ -107,9 +108,4 @@ public void onError(CaptureError error) {
         }
     };
 
-    Intent getStartIntent() {
-        return new Intent(ACTION)
-                .setFlags(FLAG_RECEIVER_FOREGROUND)
-                .setComponent(new ComponentName(SERVICE_APP_ID, BROADCAST_RECEIVER));
-    }
 }

index.js

@@ -49,9 +49,8 @@ const NFCDeviceTypes = [
 ];
 
 const { NativeCaptureModule } = NativeModules;
-let eventEmitter = new NativeEventEmitter(NativeCaptureModule);
 
-const subscription = eventEmitter.addListener("onCaptureEvent", onCaptureEvent);
+let eventEmitter = new NativeEventEmitter(NativeCaptureModule);
 
 const onCaptureEvent = (e) => {
   // maybe need to access handle here but this one doesn't get called in Android.
@@ -65,8 +64,9 @@ const onCaptureEvent = (e) => {
   }
 };
 
+const subscription = eventEmitter.addListener("onCaptureEvent", onCaptureEvent);
+
 NativeCaptureModule.open = (host, notification) => {
-  eventEmitter.addListener("onCaptureEvent", onCaptureEvent);
   NativeCaptureModule.onNotification = notification;
   return NativeCaptureModule.openTransport(host).then(
     (result) => result.transport
@@ -85,7 +85,6 @@ NativeCaptureModule.send = (handle, jsonRpc) => {
 };
 
 NativeCaptureModule.close = (handle) => {
-  console.log("index close");
   subscription.remove();
   return NativeCaptureModule.closeTransport(handle);
 };
@@ -112,8 +111,6 @@ class CaptureRn extends Capture {
     const promise = new Promise((resolve, reject) => {
       let interval;
       const openRetry = () => {
-        // options comes back undefined
-        // need to access handle here?
         clearInterval(interval);
         super
           .open(appInfo, callback, options)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-capture",
   "title": "React Native Capture",
-  "version": "1.4.23",
+  "version": "1.4.32",
   "description": "Socket Mobile CaptureSDK for React Native",
   "main": "index.js",
   "files": [

react-native-capture.podspec

@@ -13,14 +13,14 @@ Pod::Spec.new do |s|
   # optional - use expanded license entry instead:
   # s.license    = { :type => "MIT", :file => "LICENSE" }
   s.authors      = { "Socket Mobile" => "[email protected]" }
-  s.platforms    = { :ios => "11.0" }
+  s.platforms    = { :ios => "12.0" }
   s.source       = { :git => "https://github.com/SocketMobile/react-native-capture.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,c,m,swift}"
   s.requires_arc = true
 
   s.dependency "React-Core"
   # ...
-  s.dependency "CaptureSDK", "~>1.6.39"
+  s.dependency 'CaptureSDK', '~>1.8.34'
 end