feat(Android): add SDK v11.1.0

Author: tompsota

android/build.gradle

@@ -87,7 +87,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:$react_native_version"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.aheaditec.talsec.security:TalsecSecurity-Community-ReactNative:9.6.0"
+  implementation "com.aheaditec.talsec.security:TalsecSecurity-Community-ReactNative:11.1.0"
 }
 
 if (isNewArchitectureEnabled()) {

android/src/main/java/com/freeraspreactnative/FreeraspReactNativeModule.kt

@@ -9,6 +9,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.modules.core.DeviceEventManagerModule
 
@@ -32,17 +33,18 @@ class FreeraspReactNativeModule(val reactContext: ReactApplicationContext) :
   ) {
 
     try {
-      val config = parseTalsecConfig(options)
+      val config = buildTalsecConfig(options)
       FreeraspThreatHandler.listener = ThreatListener
       listener.registerListener(reactContext)
-      Talsec.start(reactContext, config)
+      runOnUiThread { // Your code to run on a different thread or UI thread
+        Talsec.start(reactContext, config)
+      }
+
       promise.resolve("freeRASP started")
 
-    } catch (e: Exception) {
-      val params = Arguments.createMap().apply {
-        putString("message", e.message)
-      }
-      promise.reject("initializationError", params)
+    }
+    catch (e: Exception) {
+      promise.reject("TalsecInitializationError", e.message, e)
     }
   }
 
@@ -85,42 +87,17 @@ class FreeraspReactNativeModule(val reactContext: ReactApplicationContext) :
     // Remove upstream listeners, stop unnecessary background tasks
   }
 
-  private fun parseTalsecConfig(config: ReadableMap): TalsecConfig {
-    val androidConfig = config.getMap("androidConfig")!!
-    val packageName = androidConfig.getString("packageName")!!
-    val certificateHashes = mutableListOf<String>()
-    val hashes = androidConfig.getArray("certificateHashes")!!
-    for (i in 0 until hashes.size()) {
-      // in RN versions < 0.63, getString is nullable
-      @Suppress("UNNECESSARY_SAFE_CALL")
-      hashes.getString(i)?.let {
-        certificateHashes.add(it)
-      }
-    }
-    val watcherMail = config.getString("watcherMail")
-    val alternativeStores = mutableListOf<String>()
-    if (androidConfig.hasKey("supportedAlternativeStores")) {
-      val stores = androidConfig.getArray("supportedAlternativeStores")!!
-      for (i in 0 until stores.size()) {
-        // in RN versions < 0.63, getString is nullable
-        @Suppress("UNNECESSARY_SAFE_CALL")
-        stores.getString(i)?.let {
-          alternativeStores.add(it)
-        }
-      }
-    }
-    var isProd = true
-    if (config.hasKey("isProd")) {
-      isProd = config.getBoolean("isProd")
-    }
+  private fun buildTalsecConfig(config: ReadableMap): TalsecConfig {
+    val androidConfig = config.getMapThrowing("androidConfig")
+    val packageName = androidConfig.getStringThrowing("packageName")
+    val certificateHashes = androidConfig.getArraySafe("certificateHashes")
+
+    val talsecBuilder = TalsecConfig.Builder(packageName, certificateHashes)
+      .watcherMail(config.getString("watcherMail"))
+      .supportedAlternativeStores(androidConfig.getArraySafe("supportedAlternativeStores"))
+      .prod(config.getBooleanSafe("isProd"))
 
-    return TalsecConfig(
-      packageName,
-      certificateHashes.toTypedArray(),
-      watcherMail,
-      alternativeStores.toTypedArray(),
-      isProd
-    )
+    return talsecBuilder.build()
   }
 
   companion object {

android/src/main/java/com/freeraspreactnative/FreeraspThreatHandler.kt

@@ -1,5 +1,6 @@
 package com.freeraspreactnative
 
+import com.aheaditec.talsec_security.security.api.SuspiciousAppInfo
 import com.aheaditec.talsec_security.security.api.ThreatListener
 
 internal object FreeraspThreatHandler : ThreatListener.ThreatDetected, ThreatListener.DeviceState {
@@ -38,6 +39,8 @@ internal object FreeraspThreatHandler : ThreatListener.ThreatDetected, ThreatLis
     listener?.threatDetected(Threat.ObfuscationIssues)
   }
 
+  override fun onMalwareDetected(p0: MutableList<SuspiciousAppInfo>?) {}
+
   override fun onUnlockedDeviceDetected() {
     listener?.threatDetected(Threat.Passcode)
   }

android/src/main/java/com/freeraspreactnative/Utils.kt

@@ -0,0 +1,40 @@
+package com.freeraspreactnative
+
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.freeraspreactnative.exceptions.TalsecException
+
+internal fun ReadableMap.getMapThrowing(key: String): ReadableMap {
+  return this.getMap(key) ?: throw TalsecException("Key missing in configuration: $key")
+}
+
+internal fun ReadableMap.getStringThrowing(key: String): String {
+  return this.getString(key) ?: throw TalsecException("Key missing in configuration: $key")
+}
+
+internal fun ReadableMap.getBooleanSafe(key: String, defaultValue: Boolean = true): Boolean {
+  if (this.hasKey(key)) {
+    return this.getBoolean(key)
+  }
+  return defaultValue
+}
+
+internal fun ReadableArray.toArray(): Array<String> {
+  val output = mutableListOf<String>()
+  for (i in 0 until this.size()) {
+    // in RN versions < 0.63, getString is nullable
+    @Suppress("UNNECESSARY_SAFE_CALL")
+    this.getString(i)?.let {
+      output.add(it)
+    }
+  }
+  return output.toTypedArray()
+}
+
+internal fun ReadableMap.getArraySafe(key: String): Array<String> {
+  if (this.hasKey(key)) {
+    val inputArray = this.getArray(key)!!
+    return inputArray.toArray()
+  }
+  return arrayOf()
+}

android/src/main/java/com/freeraspreactnative/exceptions/TalsecException.kt

@@ -0,0 +1,3 @@
+package com.freeraspreactnative.exceptions
+
+class TalsecException(message: String, val code: String? = null, val ex: Exception? = null) : Exception(message)