feat(Android): merge dev and release

Author: tompsota

android/build.gradle

@@ -66,7 +66,6 @@ repositories {
 rootProject.allprojects {
   repositories {
     maven{url "https://nexus3-public.monetplus.cz/repository/ahead-talsec-free-rasp"}
-    maven{url "https://developer.huawei.com/repo/"}
     maven{url "https://jitpack.io"}
   }
 }
@@ -79,8 +78,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  debugImplementation "com.aheaditec.talsec.security:TalsecSecurity-Community-ReactNative:6.0.0-dev"
-  releaseImplementation "com.aheaditec.talsec.security:TalsecSecurity-Community-ReactNative:6.0.0-release"
+  implementation "com.aheaditec.talsec.security:TalsecSecurity-Community-ReactNative:7.0.0"
 }
 
 if (isNewArchitectureEnabled()) {

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

@@ -12,7 +12,8 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 
 class FreeraspReactNativeModule(val reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(reactContext), ThreatListener.ThreatDetected, FreeraspDeviceStateListener.DeviceStateListener {
+  ReactContextBaseJavaModule(reactContext), ThreatListener.ThreatDetected,
+  FreeraspDeviceStateListener.DeviceStateListener {
 
   private val listener = ThreatListener(this, FreeraspDeviceStateListener)
 
@@ -104,7 +105,18 @@ class FreeraspReactNativeModule(val reactContext: ReactApplicationContext) :
         alternativeStores.add(stores.getString(i))
       }
     }
-    return TalsecConfig(packageName, certificateHashes.toTypedArray(), watcherMail, alternativeStores.toTypedArray())
+    var isProd = true
+    if (config.hasKey("isProd")) {
+      isProd = config.getBoolean("isProd")
+    }
+
+    return TalsecConfig(
+      packageName,
+      certificateHashes.toTypedArray(),
+      watcherMail,
+      alternativeStores.toTypedArray(),
+      isProd
+    )
   }
 
   companion object {