diff --git a/CHANGELOG.md b/CHANGELOG.md index 0385e85..a865103 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 #### Changed +- Android package (namespace) of the plugin renamed from `com.aheaditec.freerasp` to `app.talsec.rasp.capacitor`, following the Android SDK's `app.talsec.rasp` - On Android, `isScreenCaptureBlocked()` reports the protection state of the current activity ### Android diff --git a/android/build.gradle b/android/build.gradle index 2e113e9..fe19fe8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -29,7 +29,7 @@ apply plugin: 'kotlinx-serialization' apply plugin: 'app.talsec.plugin' android { - namespace "com.aheaditec.freerasp" + namespace "app.talsec.rasp.capacitor" talsec { sdkVersion = "20.0.1" platform = "Capacitor" diff --git a/android/src/main/java/com/aheaditec/freerasp/FreeraspPlugin.kt b/android/src/main/java/app/talsec/rasp/capacitor/FreeraspPlugin.kt similarity index 96% rename from android/src/main/java/com/aheaditec/freerasp/FreeraspPlugin.kt rename to android/src/main/java/app/talsec/rasp/capacitor/FreeraspPlugin.kt index d35c65a..d28363a 100644 --- a/android/src/main/java/com/aheaditec/freerasp/FreeraspPlugin.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/FreeraspPlugin.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp +package app.talsec.rasp.capacitor import android.annotation.SuppressLint import android.app.Activity @@ -12,17 +12,17 @@ import app.talsec.rasp.security.api.Talsec import app.talsec.rasp.security.api.TalsecConfig import app.talsec.rasp.security.api.TalsecMode import app.talsec.rasp.security.api.ThreatListener.CallState -import com.aheaditec.freerasp.dispatchers.ExecutionStateDispatcher -import com.aheaditec.freerasp.dispatchers.ThreatDispatcher -import com.aheaditec.freerasp.utils.Utils -import com.aheaditec.freerasp.utils.getArraySafe -import com.aheaditec.freerasp.utils.toEncodedJSArray -import com.aheaditec.freerasp.utils.toSuspiciousAppDetectionConfig -import com.aheaditec.freerasp.events.BaseRaspEvent -import com.aheaditec.freerasp.events.RaspExecutionStateEvent -import com.aheaditec.freerasp.events.ThreatEvent -import com.aheaditec.freerasp.interfaces.PluginExecutionStateListener -import com.aheaditec.freerasp.interfaces.PluginThreatListener +import app.talsec.rasp.capacitor.dispatchers.ExecutionStateDispatcher +import app.talsec.rasp.capacitor.dispatchers.ThreatDispatcher +import app.talsec.rasp.capacitor.utils.Utils +import app.talsec.rasp.capacitor.utils.getArraySafe +import app.talsec.rasp.capacitor.utils.toEncodedJSArray +import app.talsec.rasp.capacitor.utils.toSuspiciousAppDetectionConfig +import app.talsec.rasp.capacitor.events.BaseRaspEvent +import app.talsec.rasp.capacitor.events.RaspExecutionStateEvent +import app.talsec.rasp.capacitor.events.ThreatEvent +import app.talsec.rasp.capacitor.interfaces.PluginExecutionStateListener +import app.talsec.rasp.capacitor.interfaces.PluginThreatListener import com.getcapacitor.JSObject import com.getcapacitor.Plugin import com.getcapacitor.PluginCall diff --git a/android/src/main/java/com/aheaditec/freerasp/PluginThreatHandler.kt b/android/src/main/java/app/talsec/rasp/capacitor/PluginThreatHandler.kt similarity index 93% rename from android/src/main/java/com/aheaditec/freerasp/PluginThreatHandler.kt rename to android/src/main/java/app/talsec/rasp/capacitor/PluginThreatHandler.kt index b70e6ec..70cd469 100644 --- a/android/src/main/java/com/aheaditec/freerasp/PluginThreatHandler.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/PluginThreatHandler.kt @@ -1,13 +1,13 @@ -package com.aheaditec.freerasp +package app.talsec.rasp.capacitor import android.content.Context import app.talsec.rasp.security.api.SuspiciousAppInfo import app.talsec.rasp.security.api.ThreatListener import app.talsec.rasp.security.api.ThreatListener.CallState -import com.aheaditec.freerasp.dispatchers.ExecutionStateDispatcher -import com.aheaditec.freerasp.dispatchers.ThreatDispatcher -import com.aheaditec.freerasp.events.RaspExecutionStateEvent -import com.aheaditec.freerasp.events.ThreatEvent +import app.talsec.rasp.capacitor.dispatchers.ExecutionStateDispatcher +import app.talsec.rasp.capacitor.dispatchers.ThreatDispatcher +import app.talsec.rasp.capacitor.events.RaspExecutionStateEvent +import app.talsec.rasp.capacitor.events.ThreatEvent internal object PluginThreatHandler { diff --git a/android/src/main/java/com/aheaditec/freerasp/ScreenProtector.kt b/android/src/main/java/app/talsec/rasp/capacitor/ScreenProtector.kt similarity index 98% rename from android/src/main/java/com/aheaditec/freerasp/ScreenProtector.kt rename to android/src/main/java/app/talsec/rasp/capacitor/ScreenProtector.kt index cae002c..c0f0094 100644 --- a/android/src/main/java/com/aheaditec/freerasp/ScreenProtector.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/ScreenProtector.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp +package app.talsec.rasp.capacitor import android.annotation.SuppressLint import android.app.Activity @@ -11,7 +11,7 @@ import android.view.WindowManager.SCREEN_RECORDING_STATE_VISIBLE import androidx.annotation.RequiresApi import androidx.core.content.ContextCompat import app.talsec.rasp.security.api.Talsec -import com.aheaditec.freerasp.events.ThreatEvent +import app.talsec.rasp.capacitor.events.ThreatEvent import java.util.function.Consumer @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) diff --git a/android/src/main/java/com/aheaditec/freerasp/dispatchers/ExecutionStateDispatcher.kt b/android/src/main/java/app/talsec/rasp/capacitor/dispatchers/ExecutionStateDispatcher.kt similarity index 88% rename from android/src/main/java/com/aheaditec/freerasp/dispatchers/ExecutionStateDispatcher.kt rename to android/src/main/java/app/talsec/rasp/capacitor/dispatchers/ExecutionStateDispatcher.kt index 32780c5..401a0ed 100644 --- a/android/src/main/java/com/aheaditec/freerasp/dispatchers/ExecutionStateDispatcher.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/dispatchers/ExecutionStateDispatcher.kt @@ -1,7 +1,7 @@ -package com.aheaditec.freerasp.dispatchers +package app.talsec.rasp.capacitor.dispatchers -import com.aheaditec.freerasp.events.RaspExecutionStateEvent -import com.aheaditec.freerasp.interfaces.PluginExecutionStateListener +import app.talsec.rasp.capacitor.events.RaspExecutionStateEvent +import app.talsec.rasp.capacitor.interfaces.PluginExecutionStateListener internal object ExecutionStateDispatcher { private lateinit var listener: PluginExecutionStateListener diff --git a/android/src/main/java/com/aheaditec/freerasp/dispatchers/ThreatDispatcher.kt b/android/src/main/java/app/talsec/rasp/capacitor/dispatchers/ThreatDispatcher.kt similarity index 94% rename from android/src/main/java/com/aheaditec/freerasp/dispatchers/ThreatDispatcher.kt rename to android/src/main/java/app/talsec/rasp/capacitor/dispatchers/ThreatDispatcher.kt index 045f944..d651456 100644 --- a/android/src/main/java/com/aheaditec/freerasp/dispatchers/ThreatDispatcher.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/dispatchers/ThreatDispatcher.kt @@ -1,9 +1,9 @@ -package com.aheaditec.freerasp.dispatchers +package app.talsec.rasp.capacitor.dispatchers import app.talsec.rasp.security.api.SuspiciousAppInfo import app.talsec.rasp.security.api.ThreatListener.CallState -import com.aheaditec.freerasp.events.ThreatEvent -import com.aheaditec.freerasp.interfaces.PluginThreatListener +import app.talsec.rasp.capacitor.events.ThreatEvent +import app.talsec.rasp.capacitor.interfaces.PluginThreatListener internal object ThreatDispatcher { private lateinit var listener: PluginThreatListener diff --git a/android/src/main/java/com/aheaditec/freerasp/events/BaseRaspEvent.kt b/android/src/main/java/app/talsec/rasp/capacitor/events/BaseRaspEvent.kt similarity index 73% rename from android/src/main/java/com/aheaditec/freerasp/events/BaseRaspEvent.kt rename to android/src/main/java/app/talsec/rasp/capacitor/events/BaseRaspEvent.kt index 2ecd88b..0f66f16 100644 --- a/android/src/main/java/com/aheaditec/freerasp/events/BaseRaspEvent.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/events/BaseRaspEvent.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp.events +package app.talsec.rasp.capacitor.events internal interface BaseRaspEvent { val value: Int diff --git a/android/src/main/java/com/aheaditec/freerasp/events/RaspExecutionStateEvent.kt b/android/src/main/java/app/talsec/rasp/capacitor/events/RaspExecutionStateEvent.kt similarity index 90% rename from android/src/main/java/com/aheaditec/freerasp/events/RaspExecutionStateEvent.kt rename to android/src/main/java/app/talsec/rasp/capacitor/events/RaspExecutionStateEvent.kt index b5d802f..357ef03 100644 --- a/android/src/main/java/com/aheaditec/freerasp/events/RaspExecutionStateEvent.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/events/RaspExecutionStateEvent.kt @@ -1,6 +1,6 @@ -package com.aheaditec.freerasp.events +package app.talsec.rasp.capacitor.events -import com.aheaditec.freerasp.utils.RandomGenerator +import app.talsec.rasp.capacitor.utils.RandomGenerator import org.json.JSONArray internal sealed class RaspExecutionStateEvent(override val value: Int) : BaseRaspEvent { diff --git a/android/src/main/java/com/aheaditec/freerasp/events/ThreatEvent.kt b/android/src/main/java/app/talsec/rasp/capacitor/events/ThreatEvent.kt similarity index 96% rename from android/src/main/java/com/aheaditec/freerasp/events/ThreatEvent.kt rename to android/src/main/java/app/talsec/rasp/capacitor/events/ThreatEvent.kt index 5a11d92..2e967e1 100644 --- a/android/src/main/java/com/aheaditec/freerasp/events/ThreatEvent.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/events/ThreatEvent.kt @@ -1,6 +1,6 @@ -package com.aheaditec.freerasp.events +package app.talsec.rasp.capacitor.events -import com.aheaditec.freerasp.utils.RandomGenerator +import app.talsec.rasp.capacitor.utils.RandomGenerator import org.json.JSONArray /** diff --git a/android/src/main/java/com/aheaditec/freerasp/interfaces/PluginExecutionStateListener.kt b/android/src/main/java/app/talsec/rasp/capacitor/interfaces/PluginExecutionStateListener.kt similarity index 52% rename from android/src/main/java/com/aheaditec/freerasp/interfaces/PluginExecutionStateListener.kt rename to android/src/main/java/app/talsec/rasp/capacitor/interfaces/PluginExecutionStateListener.kt index b13af94..a6585cd 100644 --- a/android/src/main/java/com/aheaditec/freerasp/interfaces/PluginExecutionStateListener.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/interfaces/PluginExecutionStateListener.kt @@ -1,6 +1,6 @@ -package com.aheaditec.freerasp.interfaces +package app.talsec.rasp.capacitor.interfaces -import com.aheaditec.freerasp.events.RaspExecutionStateEvent +import app.talsec.rasp.capacitor.events.RaspExecutionStateEvent internal interface PluginExecutionStateListener { fun raspExecutionStateChanged(event: RaspExecutionStateEvent) diff --git a/android/src/main/java/com/aheaditec/freerasp/interfaces/PluginThreatListener.kt b/android/src/main/java/app/talsec/rasp/capacitor/interfaces/PluginThreatListener.kt similarity index 77% rename from android/src/main/java/com/aheaditec/freerasp/interfaces/PluginThreatListener.kt rename to android/src/main/java/app/talsec/rasp/capacitor/interfaces/PluginThreatListener.kt index 9c37d39..94039f1 100644 --- a/android/src/main/java/com/aheaditec/freerasp/interfaces/PluginThreatListener.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/interfaces/PluginThreatListener.kt @@ -1,8 +1,8 @@ -package com.aheaditec.freerasp.interfaces +package app.talsec.rasp.capacitor.interfaces import app.talsec.rasp.security.api.SuspiciousAppInfo import app.talsec.rasp.security.api.ThreatListener.CallState -import com.aheaditec.freerasp.events.ThreatEvent +import app.talsec.rasp.capacitor.events.ThreatEvent internal interface PluginThreatListener { fun threatDetected(threatEventType: ThreatEvent) diff --git a/android/src/main/java/com/aheaditec/freerasp/models/CapSuspiciousAppInfo.kt b/android/src/main/java/app/talsec/rasp/capacitor/models/CapSuspiciousAppInfo.kt similarity index 92% rename from android/src/main/java/com/aheaditec/freerasp/models/CapSuspiciousAppInfo.kt rename to android/src/main/java/app/talsec/rasp/capacitor/models/CapSuspiciousAppInfo.kt index 9dcadeb..a045ec3 100644 --- a/android/src/main/java/com/aheaditec/freerasp/models/CapSuspiciousAppInfo.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/models/CapSuspiciousAppInfo.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp.models +package app.talsec.rasp.capacitor.models import kotlinx.serialization.Serializable diff --git a/android/src/main/java/com/aheaditec/freerasp/utils/Extensions.kt b/android/src/main/java/app/talsec/rasp/capacitor/utils/Extensions.kt similarity index 96% rename from android/src/main/java/com/aheaditec/freerasp/utils/Extensions.kt rename to android/src/main/java/app/talsec/rasp/capacitor/utils/Extensions.kt index af5ae3e..aedb7d7 100644 --- a/android/src/main/java/com/aheaditec/freerasp/utils/Extensions.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/utils/Extensions.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp.utils +package app.talsec.rasp.capacitor.utils import android.content.Context import android.content.pm.PackageInfo @@ -9,8 +9,8 @@ import app.talsec.rasp.security.api.ReasonMode import app.talsec.rasp.security.api.ScopeType import app.talsec.rasp.security.api.SuspiciousAppDetectionConfig import app.talsec.rasp.security.api.SuspiciousAppInfo -import com.aheaditec.freerasp.models.CapPackageInfo -import com.aheaditec.freerasp.models.CapSuspiciousAppInfo +import app.talsec.rasp.capacitor.models.CapPackageInfo +import app.talsec.rasp.capacitor.models.CapSuspiciousAppInfo import com.getcapacitor.JSArray import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json diff --git a/android/src/main/java/com/aheaditec/freerasp/utils/RandomGenerator.kt b/android/src/main/java/app/talsec/rasp/capacitor/utils/RandomGenerator.kt similarity index 93% rename from android/src/main/java/com/aheaditec/freerasp/utils/RandomGenerator.kt rename to android/src/main/java/app/talsec/rasp/capacitor/utils/RandomGenerator.kt index fbde705..9f4f9a3 100644 --- a/android/src/main/java/com/aheaditec/freerasp/utils/RandomGenerator.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/utils/RandomGenerator.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp.utils +package app.talsec.rasp.capacitor.utils import java.security.SecureRandom import java.util.concurrent.ConcurrentHashMap diff --git a/android/src/main/java/com/aheaditec/freerasp/utils/Utils.kt b/android/src/main/java/app/talsec/rasp/capacitor/utils/Utils.kt similarity index 98% rename from android/src/main/java/com/aheaditec/freerasp/utils/Utils.kt rename to android/src/main/java/app/talsec/rasp/capacitor/utils/Utils.kt index 3dfb747..f31a729 100644 --- a/android/src/main/java/com/aheaditec/freerasp/utils/Utils.kt +++ b/android/src/main/java/app/talsec/rasp/capacitor/utils/Utils.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp.utils +package app.talsec.rasp.capacitor.utils import android.content.Context import android.content.pm.ApplicationInfo