Merge pull request #29 from talsec/fix-cordova-ios-issue

Fix cordova ios issue

CHANGELOG.md

@@ -1,3 +1,13 @@
+# freeRASP 6.1.2
+
+### Android
+
+-   ❗ Removed the talsec namespace that caused change of namespaces for whole app
+
+### iOS
+
+-   ⚡ Fixed issue causing app crash with lower versions of `cordova-ios` plugin
+
 # freeRASP 6.1.1
 
 ### Android

package.json

@@ -1,6 +1,6 @@
 {
     "name": "cordova-talsec-plugin-freerasp",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "Cordova plugin for improving app security and threat monitoring on Android and iOS mobile devices.",
     "cordova": {
         "id": "cordova-talsec-plugin-freerasp",

plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         id="cordova-talsec-plugin-freerasp"
-        version="6.1.1">
+        version="6.1.2">
 
   <name>freerasp</name>
   <author>Talsec ([email protected])</author>

src/android/talsec.gradle

@@ -13,7 +13,7 @@ android {
             srcDirs += 'src/main/kotlin'
         }
     }
-    if (project.android.hasProperty("namespace")) {
+    if (project.android.hasProperty("namespace") && project.android.namespace == null) {
         namespace("com.aheaditec.talsec.cordova")
     }
 }

src/ios/TalsecPlugin.swift

@@ -3,11 +3,14 @@ import TalsecRuntime
 
 @objc(TalsecPlugin) class TalsecPlugin : CDVPlugin {
     public static var shared:TalsecPlugin?
-    let threatIdentifierList = (1...12).map { _ in Int.random(in: 100_000..<999_999_999) }
+    var threatIdentifierList: [Int] = (1...12).map { _ in Int.random(in: 100_000..<999_999_999) }
 
     override func pluginInitialize() {
         TalsecContext.context.commandDelegate = self.commandDelegate
         TalsecPlugin.shared = self
+        if (threatIdentifierList == nil) {
+            threatIdentifierList = (1...12).map { _ in Int.random(in: 100_000..<999_999_999) }
+        }
     }
 
     /**