react-native-acoustic-connect-beta 16.0.23 → 16.0.25

package/Example/nativebase-v3-kitchensink/ConnectConfig.json

@@ -5,6 +5,7 @@
     "KillSwitchUrl": "https://lib-us-2.brilliantcollector.com/collector/switch/b6c3709b7a4c479bb4b5a9fb8fec324c",
     "useRelease": false,
     "iOSVersion": "",
+    "AndroidVersion": "",
     "layoutConfig": {
       "AutoLayout": {
         "GlobalScreenSettings": {

package/Example/nativebase-v3-kitchensink/android/app/build.gradle

@@ -264,5 +264,4 @@ dependencies {
 apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle")
 applyNativeModulesAppBuildGradle(project)
 
-//apply from: project(':react-native-acoustic-ea-tealeaf-beta').projectDir.getPath() + "/config.gradle"
 apply from: project(':react-native-acoustic-connect-beta').projectDir.getPath() + "/config.gradle"

package/Example/nativebase-v3-kitchensink/android/app/src/main/java/com/geekyants/kitchensinkappnativebase/MainActivity.java

@@ -2,21 +2,19 @@ package com.geekyants.kitchensinkappnativebase;
 
 import android.os.Bundle;
 import android.view.MotionEvent;
-
+import com.acoustic.connect.android.connectmod.Connect;
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactActivityDelegate;
-//import com.tl.uic.Tealeaf;
-
 import expo.modules.ReactActivityDelegateWrapper;
 
 public class MainActivity extends ReactActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(null);
-  }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(null);
+    }
 
     /**
      * Returns the name of the main component registered from JavaScript.
@@ -34,16 +32,20 @@ public class MainActivity extends ReactActivity {
      */
     @Override
     protected ReactActivityDelegate createReactActivityDelegate() {
-        return new ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, new DefaultReactActivityDelegate(
+        return new ReactActivityDelegateWrapper(
             this,
-            getMainComponentName(),
-            // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-            DefaultNewArchitectureEntryPoint.getFabricEnabled()));
+            BuildConfig.IS_NEW_ARCHITECTURE_ENABLED,
+            new DefaultReactActivityDelegate(
+                this,
+                getMainComponentName(),
+                // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+                DefaultNewArchitectureEntryPoint.getFabricEnabled()
+            )
+        );
     }
 
-    @Override
     public boolean dispatchTouchEvent(MotionEvent e) {
-//        Tealeaf.dispatchTouchEvent(this, e);
+        Connect.INSTANCE.dispatchTouchEvent(this, e);
         return super.dispatchTouchEvent(e);
     }
 }

package/Example/nativebase-v3-kitchensink/package.json

@@ -15,7 +15,7 @@
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "react-native": "0.72.10",
-        "react-native-acoustic-connect-beta": "16.0.23",
+        "react-native-acoustic-connect-beta": "16.0.25",
         "react-native-gesture-handler": "~2.12.0",
         "react-native-keyboard-aware-scroll-view": "^0.9.5",
         "react-native-reanimated": "~3.3.0",

package/android/build.gradle

@@ -45,7 +45,5 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
 
     // Connect SDK libraries
-    implementation 'io.github.go-acoustic:connect:+'
-    implementation "io.github.go-acoustic:tealeaf:+"
-    implementation 'io.github.go-acoustic:eocore:+'
+    api 'io.github.go-acoustic:connect:+'
 }

package/android/config.gradle

@@ -13,15 +13,15 @@ import java.util.regex.Pattern
 import groovy.json.JsonSlurper
 import groovy.json.JsonOutput
 
+def getConfigJSON() {
+    def configFile = "$project.rootDir/../ConnectConfig.json"
+    println("Reading file $configFile")
+    def jsonSlurper = new JsonSlurper()
+    return jsonSlurper.parse(new File(configFile))
+}
 
-println("Executing config.gradle")
-
-def writeConfig(json) {
-    def module_path = project(':react-native-acoustic-connect-beta').projectDir.getPath()
-    def propertiesFile = "$module_path/src/main/assets/TealeafBasicConfig.properties"
-    
-    println("Writing config to file $propertiesFile")
-    
+def updateTealeafBasicConfig(mp, json) {
+    def propertiesFile = "$mp/src/main/assets/TealeafBasicConfig.properties"
     FileInputStream _file = new FileInputStream(propertiesFile);
     Properties properties = new Properties();
     properties.load(_file);
@@ -30,65 +30,82 @@ def writeConfig(json) {
     FileOutputStream out = new FileOutputStream(propertiesFile);
 
     json.each { key, value ->
-        if(key != "Tealeaf"){ return }
+        if(key != "Connect"){ return }
 
+        println("Update/Add the following key/values:")
         value.each { config_key, config_value ->
             if(config_value.getClass() != java.lang.String
             && config_value.getClass() != java.lang.Boolean
             && config_value.getClass() != java.lang.Integer){
                 return
             }
-            properties.setProperty(config_key, config_value.toString())
+            // Just update the following items
+            if (config_key == "AppKey" ||
+                config_key == "PostMessageUrl" ||
+                config_key == "KillSwitchUrl") {
+                println(config_key + "=" + config_value)
+                properties.setProperty(config_key, config_value.toString())
+            }
         }
     }
 
     properties.store(out, null);
     out.close();
+    println("Updating:$propertiesFile")
 }
 
-def getConfigJSON() {
-    def configFile = "$project.rootDir/../ConnectConfig.json"
-    
-    println("Reading file $configFile")
-    
-    def jsonSlurper = new JsonSlurper()
-    def data = jsonSlurper.parse(new File(configFile))
-}
-
-def overrideLayoutConfig(){
-    def configFilePath = "$project.rootDir/../ConnectConfig.json"
-    def module_path = project(':react-native-acoustic-connect-beta').projectDir.getPath()
-    def layoutConfigPath = "$module_path/src/main/assets/TealeafLayoutConfig.json"
-    def layoutConfigDefaultPath = "$module_path/src/main/assets/TealeafLayoutConfigDefault.json"
-
-    def configFile = new File(configFilePath)
-
-    def jsonSlurper = new JsonSlurper()
-    def data = jsonSlurper.parse(configFile)
-
-    def override = data.Connect.layoutConfig;
-
+def updateLayoutConfig(mp, json){
+    def layoutConfigPath = "$mp/src/main/assets/TealeafLayoutConfig.json"
+    def layoutConfigDefaultPath = "$mp/src/main/assets/TealeafLayoutConfigDefault.json"
+    def override = json.Connect.layoutConfig;
     def overrideJson =  JsonOutput.toJson(override)
 
-
     if(override != null){
         def layoutConfigFile = new File(layoutConfigPath)
         layoutConfigFile.text = overrideJson
-    }else{
-          def layoutConfigDefaultFile = new File(layoutConfigDefaultPath)
-          def layoutConfigFile = new File(layoutConfigPath)
-          layoutConfigFile.text = layoutConfigDefaultFile.text
-
-    }   
+    } else {
+        def layoutConfigDefaultFile = new File(layoutConfigDefaultPath)
+        def layoutConfigFile = new File(layoutConfigPath)
+        layoutConfigFile.text = layoutConfigDefaultFile.text
+    }
+    println("Updating:$layoutConfigPath")
 }
 
+def updateGradle(mp, json){
+    def buildGradlePath = "$mp/build.gradle"
+    def buildGradleFile = new File(buildGradlePath)
+    def updatedBuildGradle = buildGradleFile.text
+
+    if (json != null && json.Connect) {
+        if(json.Connect.AndroidVersion != null) {
+            def connectSDK = "io.github.go-acoustic:connect:"
+            if(json.Connect.AndroidVersion.length() > 0) {
+                connectSDK += json.Connect.AndroidVersion
+            } else {
+                connectSDK += "+"
+            }
+            updatedBuildGradle = updatedBuildGradle.replaceAll(~/io.github.go-acoustic:connect:(\+|\d+.\d+.\d+)/, connectSDK)
+        }
+    }
+
+    buildGradleFile.text = updatedBuildGradle
+    println("Updating:$buildGradlePath")
+}
 
 try {
-    
-    writeConfig(getConfigJSON())
+    def module_path = project(':react-native-acoustic-connect-beta').projectDir.getPath()
 
-    overrideLayoutConfig()
-    
+    println("**Acoustic Integration***********************************************************************")
+    println("Executing $module_path/config.gradle")
+    println("Step 1:")
+    def configJSONData = getConfigJSON()
+    println("Step 2:")
+    updateTealeafBasicConfig(module_path, configJSONData)
+    println("Step 3:")
+    updateLayoutConfig(module_path, configJSONData)
+    println("Step 4:")
+    updateGradle(module_path, configJSONData)
+    println("*********************************************************************************************")
 } catch (FileNotFoundException e) {
     e.printStackTrace()
 } catch (IOException e) {

package/package.json

@@ -38,5 +38,5 @@
         "verifyConnectSetup": "node scripts/verifyConnectSetup.js $INIT_CWD"
     },
     "summary": "react-native ios android tealeaf connect cxa wxca er enhanced-replay",
-    "version": "16.0.23"
+    "version": "16.0.25"
 }

package/scripts/ConnectConfig.json

@@ -5,6 +5,7 @@
     "KillSwitchUrl": "https://lib-us-2.brilliantcollector.com/collector/switch/b6c3709b7a4c479bb4b5a9fb8fec324c",
     "useRelease": false,
     "iOSVersion": "",
+    "AndroidVersion": "",
     "layoutConfig": {
       "AutoLayout": {
         "GlobalScreenSettings": {

package/scripts/javaParser.js

@@ -7,74 +7,130 @@ const { exit } = require("process");
 const { isValid } = require('./util');
 const directoryPath = path.join(__dirname, "..", "..", "..");
 
+console.log("**Acoustic Integration***********************************************************************");
+
 if (!isValid(`${directoryPath}/android`)) {
+  console.log("Directory not valid:")
+  console.log(`${directoryPath}/android`)
+  console.log("*********************************************************************************************");
   exit(0);
 }
 
-const xmlFilePath = `${directoryPath}/android/app/src/main/AndroidManifest.xml`;
+function readFile(path) {
+  let data = "";
+  try {
+    data = fs.readFileSync(path, "utf8");
+    console.log("Read:" + path);
+    // console.log(data);
+  } catch (err) {
+    console.log("Error reading:" + path);
+    console.error(err);
+  }
+  return data;
+}
 
-const options = {
-  ignoreAttributes: false,
-  format: true,
-  preserveOrder: false,
-};
+const buildGradlePath = `${directoryPath}/android/app/build.gradle`;
+console.log("Read build.gradle to get applicationId");
+const buildGradleFile = readFile(buildGradlePath)
 
-const parser = new XMLParser(options);
+const regex = /applicationId.*/g;
+const foundIt = buildGradleFile.match(regex);
 
-let xmlData = "";
-try {
-  xmlData = fs.readFileSync(xmlFilePath, "utf8");
-} catch (err) {
-  console.error(err);
+let packageName = null
+if (foundIt != null && foundIt[0] != null) {
+  const singleQuote = foundIt[0].split("'");
+  const doubleQuote = foundIt[0].split('"');
+  if (singleQuote != null && singleQuote.length >= 2) {
+    packageName = singleQuote[1];
+  } else if (doubleQuote != null && doubleQuote.length >= 2) {
+    packageName = doubleQuote[1];
+  }
 }
 
-const jsonObj = parser.parse(xmlData);
-const packageName = jsonObj["manifest"]["@_package"];
-const upperJavaPath = packageName.replace(/\./g, "/");
-const upperJavaCode =  `package ${packageName};`;
-const filePath = `${directoryPath}/android/app/src/main/java/${upperJavaPath}/MainActivity.java`;
-
-let javaData = "";
-try {
-  javaData = fs.readFileSync(filePath, "utf8");
-} catch (err) {
-  console.error(err);
+if (packageName == null) {
+  const xmlFilePath = `${directoryPath}/android/app/src/main/AndroidManifest.xml`;
+  console.log("Did not find it in " + buildGradlePath + ". I will look in " + xmlFilePath);
+  const manifestFile = readFile(xmlFilePath)
+  const options = {
+    ignoreAttributes: false,
+    format: true,
+    preserveOrder: false,
+  };
+  const parser = new XMLParser(options);
+  const jsonObj = parser.parse(manifestFile);
+  packageName = jsonObj["manifest"]["@_package"];
+}
+
+console.log("Found the following applicationId:" + packageName);
+if (packageName == null) {
+  console.log("applicationId not found:")
+  console.log("*********************************************************************************************");
+  exit(0);
 }
 
+const upperJavaPath = packageName.replace(/\./g, "/");
+const mainActivityPath = `${directoryPath}/android/app/src/main/java/${upperJavaPath}/MainActivity.java`;
+const mainActivityFile = readFile(mainActivityPath)
+
 const javaCode = `public boolean dispatchTouchEvent(MotionEvent e) {
-                    Connect.dispatchTouchEvent(this, e);
+                    Connect.INSTANCE.dispatchTouchEvent(this, e);
                     return super.dispatchTouchEvent(e);
                 }`;
+const upperJavaCode = `package ${packageName};`;
+const javaCode2 = `${upperJavaCode}\nimport com.acoustic.connect.android.connectmod.Connect;`;
+const javaCode3 = `Connect.INSTANCE.dispatchTouchEvent(this, e);
+                   return super.dispatchTouchEvent(e);`;
 
-const javaCode2 =`${upperJavaCode}\nimport com.acoustic.connect.android.connectmod.Connect;`
-const re = new RegExp(/dispatchTouchEvent/, "g");
-const re2 = new RegExp("import com.acoustic.connect.android.connectmod.Connect", "g");
-const found = re.test(javaData);
+// Setup to update file
+let updateMainActivityData = prettier.format(mainActivityFile, {
+  parser: "java",
+  plugins: [javaPaserPlugin],
+  tabWidth: 4,
+});
 
-if (!found) {
-  let result = prettier.format(javaData, {
-    parser: "java",
-    plugins: [javaPaserPlugin],
-    tabWidth: 2,
-  });
+let updateMainActivity = false;
 
-  result = `${result.substring(0, result.length - 2)}${javaCode} }`;
+// Look for dispatchTouchEvent method
+const regExDispatchTouchEvent = new RegExp(/oolean dispatchTouchEvent/, "g");
+if (!regExDispatchTouchEvent.test(updateMainActivityData)) {
+  updateMainActivity = true;
+  // Add dispatchTouchEvent method with library call
+  updateMainActivityData = `${updateMainActivityData.substring(0, updateMainActivityData.length - 2)}${javaCode} }`;
+}
 
-  const found2 = re2.test(result);
+// Check if our call has been added in dispatchTouchEvent
+const regExConnectDispatchTouchEvent = new RegExp(/Connect.INSTANCE.dispatchTouchEvent/, "g");
+if (!regExConnectDispatchTouchEvent.test(updateMainActivityData)) {
+  updateMainActivity = true;
+  // Add Connect.INSTANCE.dispatchTouchEvent
+  updateMainActivityData = updateMainActivityData.replace(/return super.dispatchTouchEvent\(e\);/, javaCode3);
+}
 
-  if(!found2){
-    result = result.replace(upperJavaCode,javaCode2); 
-  }
+// Look for import
+const regExImport = new RegExp("import com.acoustic.connect.android.connectmod.Connect", "g");
+if(!regExImport.test(updateMainActivityData)){
+  updateMainActivity = true;
+  // Add import
+  updateMainActivityData = updateMainActivityData.replace(upperJavaCode,javaCode2); 
+}
 
-  result = prettier.format(result, {
+// Update activity
+if (updateMainActivity) {
+    updateMainActivityData = prettier.format(updateMainActivityData, {
     parser: "java",
     plugins: [javaPaserPlugin],
-    tabWidth: 2,
+    tabWidth: 4,
   });
 
   try {
-    fs.writeFileSync(filePath, result);
+    fs.writeFileSync(mainActivityPath, updateMainActivityData);
+    console.log("Updated:" + mainActivityPath);
   } catch (err) {
+    console.log("Error writing:" + mainActivityPath);
     console.error(err);
   }
+} else {
+  console.log("Update not needed for:" + mainActivityPath);
 }
+
+console.log("*********************************************************************************************");

package/android/src/main/assets/ConnectAdvancedConfig.json

@@ -1,3 +0,0 @@
-{
-    "LibraryVersion": "10.4.21"
-}