updated logic for v1.4.39

Author: mcsocket

README.md

@@ -1,16 +1,18 @@
-# react-native-capture 1.4.32
+# react-native-capture 1.4.39
 
 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.
 
 # Devices compatibility and CaptureSDK versions
 
-|                    Devices                     | <= 1.2 | 1.3 | 1.4 |
-| :--------------------------------------------: | :----: | :-: | :-: |
-|               **SocketCam C860**               |   ❌   | ❌  | ❌  |
-|               **SocketCam C820**               |   ❌   | ❌  | ✅  |
-|               **S720/D720/S820**               |   ❌   | ✅  | ✅  |
-| **D600, S550, and all other barcode scanners** |   ✅   | ✅  | ✅  |
-|                    **S370**                    |   ❌   | ❌  | ✅  |
+|                    Devices                     | <= 1.2 | 1.3 |   1.4   |
+| :--------------------------------------------: | :----: | :-: | :-----: |
+|               **SocketCam C860**               |   ❌   | ❌  | ✅ [^1] |
+|               **SocketCam C820**               |   ❌   | ❌  |   ✅    |
+|               **S720/D720/S820**               |   ❌   | ✅  |   ✅    |
+| **D600, S550, and all other barcode scanners** |   ✅   | ✅  |   ✅    |
+|                    **S370**                    |   ❌   | ❌  |   ✅    |
+
+[^1]: _SocketCam C860 is currently supported on the latest version of Android only. More on SocketCam can be found [here](https://www.socketmobile.com/readers-accessories/product-families/socketcam)._
 
 ## Getting started
 
@@ -217,6 +219,40 @@ Next, in their `app/gradle.build` file, they will need to add the below code.
     }
 ```
 
+## Enable Start Capture Service on Android
+
+In order enable Start Capture Service on Android (so that the developer does't need to actively run/open Companion on the same device), the developer will need to add some security configurations to allow this service to run in the background of their app.
+
+First, in `your-app/android/app/src/main/res`, there needs to be an `xml` directory if there isn't one already. In that directory, you will need to add the file `network_security_config.xml`. That file should contain the below information.
+
+```
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="false" />
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">localhost</domain>
+        <domain includeSubdomains="false">127.0.0.1</domain>
+    </domain-config>
+</network-security-config>
+
+```
+
+Then, in their app's `AndroidManifest.xml` file, the developer will need to add the below property into the `<application>` tag.
+
+```
+android:networkSecurityConfig="@xml/network_security_config"
+```
+
+Finally, add the below line into just before the `AndroidManifest.xml` file's closing `</manifest>` tag.
+
+```
+<queries>
+    <package android:name="com.socketmobile.companion"/>
+  </queries>
+```
+
+For more on the network security configuration for Android, please check out the cleartext section in [the Android docs](https://docs.socketmobile.com/capture/java/en/latest/android/getting-started.html#enable-cleartext-traffic).
+
 ## 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/src/main/java/com/socketmobile/CaptureModule.java

@@ -76,9 +76,17 @@ public void startSocketCamExtension(int clientHandle){
 
     @ReactMethod
     public void startCaptureService(Promise promise) {
-        Context context = getReactApplicationContext();
-        context.sendBroadcast(getStartIntent());
-        promise.resolve(null);
+        try {
+            Context context = getReactApplicationContext();
+            String serviceStarted = CaptureService.start(context);
+            if (serviceStarted.indexOf("success") != -1){
+                promise.resolve(serviceStarted);
+            } else {
+                promise.resolve("Could not start capture service.");
+            }
+        } catch (Exception e) {
+            promise.reject("CAPTURE_SERVICE_ERROR", "Error starting capture service", e);
+        }
     }
 
     public void createExtensionEventAndTrigger(String message, int status){

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

@@ -0,0 +1,91 @@
+package com.socketmobile;
+
+import android.annotation.SuppressLint;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.util.Log;
+
+import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;
+
+import com.facebook.react.bridge.ReactContext;
+
+import java.util.logging.Logger;
+
+final class CaptureService {
+    private static final String BASE_PACKAGE = "com.socketmobile.capture";
+    private static final String SERVICE_APP_ID = "com.socketmobile.companion";
+    private static final String BROADCAST_RECEIVER = BASE_PACKAGE + ".StartService";
+    private static final String ACTION = BASE_PACKAGE + ".START_SERVICE";
+    private static final String SERVICE_NAME = BASE_PACKAGE + ".AndroidService";
+
+    private static final Logger log = Logger.getLogger(CaptureService.class.getName());
+
+    private CaptureService() {
+        throw new UnsupportedOperationException(
+                this.getClass().getName() + " is a utility class. Do not instantiate.");
+    }
+
+    static Intent getInstallIntent(Context context) {
+        Uri marketUri = Uri.parse("market://details?id=" + SERVICE_APP_ID);
+        Uri httpUri = Uri.parse("https://play.google.com/store/apps/details?id=" + SERVICE_APP_ID);
+
+        Intent marketIntent = new Intent(Intent.ACTION_VIEW, marketUri);
+        if (systemCanHandleIntent(context, marketIntent, PackageManager.MATCH_DEFAULT_ONLY)) {
+            return marketIntent;
+        } else {
+            return new Intent(Intent.ACTION_VIEW, httpUri);
+        }
+
+    }
+
+    @SuppressLint("InlinedApi") static Intent getStartIntent() {
+        return new Intent(ACTION)
+                .setFlags(FLAG_RECEIVER_FOREGROUND)
+                .setComponent(new ComponentName(SERVICE_APP_ID, BROADCAST_RECEIVER));
+    }
+
+    static boolean isInstalled(Context context) {
+        return systemCanHandleBroadcast(context, getStartIntent(), 0);
+    }
+
+    static void install(Context context) {
+        context.startActivity(getInstallIntent(context));
+    }
+
+    public static String start(Context context) {
+        try {
+            Intent serviceIntent = getExplicitStartIntent(context);
+            if (serviceIntent != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    context.startForegroundService(serviceIntent);
+                    return "successfully started with startForegroundService";
+                }
+                context.sendBroadcast(getStartIntent());
+            }
+        } catch (Exception e) {
+            Log.d("CaptureService", "Could not start with startForeground Service: " + e.getMessage());
+            e.printStackTrace();
+            context.sendBroadcast(getStartIntent());
+            return "successfully started with sendBroadcast";
+        }
+        return "Error starting service: Unknown error";
+    }
+
+    private static Intent getExplicitStartIntent(Context context) {
+        return new Intent()
+                .setComponent(new ComponentName(SERVICE_APP_ID, SERVICE_NAME));
+    }
+
+    private static boolean systemCanHandleIntent(Context ctx, Intent i, int flags) {
+        return ctx.getPackageManager().queryIntentActivities(i, flags).size() > 0;
+    }
+
+    private static boolean systemCanHandleBroadcast(Context ctx, Intent i, int flags) {
+        return ctx.getPackageManager().queryBroadcastReceivers(i, flags).size() > 0;
+    }
+}
+

package.json

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