diff --git a/CHANGELOG.md b/CHANGELOG.md index f7f9079..87d01f7 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.flutter`, following the Android SDK's `app.talsec.rasp` - On Android, `Talsec.isScreenCaptureBlocked()` reports the protection state of the current activity ### Android diff --git a/android/build.gradle b/android/build.gradle index 2c48362..7352feb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,4 @@ -group 'com.aheaditec.freerasp' +group 'app.talsec.rasp.flutter' version '1.0-SNAPSHOT' buildscript { @@ -32,7 +32,7 @@ apply plugin: 'app.talsec.plugin' android { if (project.android.hasProperty("namespace")) { - namespace("com.aheaditec.freerasp") + namespace("app.talsec.rasp.flutter") } compileSdk 36 diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index b299bf1..bc71b75 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="app.talsec.rasp.flutter"> diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/Extensions.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/Extensions.kt similarity index 86% rename from android/src/main/kotlin/com/aheaditec/freerasp/Extensions.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/Extensions.kt index 7ede6ee..2d87996 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/Extensions.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/Extensions.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp +package app.talsec.rasp.flutter import android.content.Context import android.content.pm.PackageInfo @@ -13,9 +13,9 @@ import io.flutter.plugin.common.MethodChannel import org.json.JSONArray import org.json.JSONObject import app.talsec.rasp.security.api.ThreatListener.CallState -import com.aheaditec.freerasp.generated.CallState as FlutterCallState -import com.aheaditec.freerasp.generated.PackageInfo as FlutterPackageInfo -import com.aheaditec.freerasp.generated.SuspiciousAppInfo as FlutterSuspiciousAppInfo +import app.talsec.rasp.flutter.generated.CallState as FlutterCallState +import app.talsec.rasp.flutter.generated.PackageInfo as FlutterPackageInfo +import app.talsec.rasp.flutter.generated.SuspiciousAppInfo as FlutterSuspiciousAppInfo /** * Executes the provided block of code and catches any exceptions thrown by it, returning the @@ -34,10 +34,10 @@ internal inline fun runResultCatching(result: MethodChannel.Result, block: () -> } /** - * Converts a [SuspiciousAppInfo] instance to a [com.aheaditec.freerasp.generated.SuspiciousAppInfo] + * Converts a [SuspiciousAppInfo] instance to a [app.talsec.rasp.flutter.generated.SuspiciousAppInfo] * instance used by Pigeon package for Flutter. * - * @return A new [com.aheaditec.freerasp.generated.SuspiciousAppInfo] object with information from + * @return A new [app.talsec.rasp.flutter.generated.SuspiciousAppInfo] object with information from * this [SuspiciousAppInfo]. */ internal fun SuspiciousAppInfo.toPigeon(context: Context): FlutterSuspiciousAppInfo { @@ -45,10 +45,10 @@ internal fun SuspiciousAppInfo.toPigeon(context: Context): FlutterSuspiciousAppI } /** - * Converts a [PackageInfo] instance to a [com.aheaditec.freerasp.generated.PackageInfo] instance + * Converts a [PackageInfo] instance to a [app.talsec.rasp.flutter.generated.PackageInfo] instance * used by Pigeon package for Flutter. * - * @return A new [com.aheaditec.freerasp.generated.PackageInfo] object with information from + * @return A new [app.talsec.rasp.flutter.generated.PackageInfo] object with information from * this [PackageInfo]. */ private fun PackageInfo.toPigeon(context: Context): FlutterPackageInfo { @@ -121,7 +121,7 @@ internal fun JSONObject.toSuspiciousAppDetectionConfig(): SuspiciousAppDetection } /** - * Converts a [CallState] instance to a [com.aheaditec.freerasp.generated.CallState] instance + * Converts a [CallState] instance to a [app.talsec.rasp.flutter.generated.CallState] instance * used by Pigeon package for Flutter. */ internal fun CallState.toPigeon(): FlutterCallState { diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/FreeraspPlugin.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/FreeraspPlugin.kt similarity index 92% rename from android/src/main/kotlin/com/aheaditec/freerasp/FreeraspPlugin.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/FreeraspPlugin.kt index cbbf80f..d0f473a 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/FreeraspPlugin.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/FreeraspPlugin.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp +package app.talsec.rasp.flutter import android.app.Activity import android.content.Context @@ -6,10 +6,10 @@ import android.os.Build import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleOwner -import com.aheaditec.freerasp.handlers.ExecutionStateStreamHandler -import com.aheaditec.freerasp.handlers.MethodCallHandler -import com.aheaditec.freerasp.handlers.StreamHandler -import com.aheaditec.freerasp.handlers.TalsecThreatHandler +import app.talsec.rasp.flutter.handlers.ExecutionStateStreamHandler +import app.talsec.rasp.flutter.handlers.MethodCallHandler +import app.talsec.rasp.flutter.handlers.StreamHandler +import app.talsec.rasp.flutter.handlers.TalsecThreatHandler import io.flutter.embedding.engine.plugins.FlutterPlugin import io.flutter.embedding.engine.plugins.activity.ActivityAware import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/RaspExecutionStateEvent.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/RaspExecutionStateEvent.kt similarity index 89% rename from android/src/main/kotlin/com/aheaditec/freerasp/RaspExecutionStateEvent.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/RaspExecutionStateEvent.kt index 04bed32..15ab836 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/RaspExecutionStateEvent.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/RaspExecutionStateEvent.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp +package app.talsec.rasp.flutter internal sealed class RaspExecutionStateEvent(val value: Int) { object FastChecksFinished : RaspExecutionStateEvent(187429) diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/ScreenProtector.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/ScreenProtector.kt similarity index 99% rename from android/src/main/kotlin/com/aheaditec/freerasp/ScreenProtector.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/ScreenProtector.kt index d63ddb6..8dfb672 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/ScreenProtector.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/ScreenProtector.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp +package app.talsec.rasp.flutter import android.annotation.SuppressLint import android.app.Activity diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/Threat.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/Threat.kt similarity index 97% rename from android/src/main/kotlin/com/aheaditec/freerasp/Threat.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/Threat.kt index 6e733a4..a118369 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/Threat.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/Threat.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp +package app.talsec.rasp.flutter /** * Sealed class to represent the error codes. diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/Utils.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/Utils.kt similarity index 99% rename from android/src/main/kotlin/com/aheaditec/freerasp/Utils.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/Utils.kt index bf0ebba..a897820 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/Utils.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/Utils.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp +package app.talsec.rasp.flutter import android.content.Context import android.graphics.Bitmap diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/dispatchers/ExecutionStateDispatcher.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/dispatchers/ExecutionStateDispatcher.kt similarity index 93% rename from android/src/main/kotlin/com/aheaditec/freerasp/dispatchers/ExecutionStateDispatcher.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/dispatchers/ExecutionStateDispatcher.kt index 3449855..245c81a 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/dispatchers/ExecutionStateDispatcher.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/dispatchers/ExecutionStateDispatcher.kt @@ -1,6 +1,6 @@ -package com.aheaditec.freerasp.dispatchers +package app.talsec.rasp.flutter.dispatchers -import com.aheaditec.freerasp.RaspExecutionStateEvent +import app.talsec.rasp.flutter.RaspExecutionStateEvent import io.flutter.plugin.common.EventChannel.EventSink internal object ExecutionStateDispatcher { diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/dispatchers/ThreatDispatcher.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/dispatchers/ThreatDispatcher.kt similarity index 95% rename from android/src/main/kotlin/com/aheaditec/freerasp/dispatchers/ThreatDispatcher.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/dispatchers/ThreatDispatcher.kt index 1db9e06..f2ec65c 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/dispatchers/ThreatDispatcher.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/dispatchers/ThreatDispatcher.kt @@ -1,7 +1,7 @@ -package com.aheaditec.freerasp.dispatchers +package app.talsec.rasp.flutter.dispatchers -import com.aheaditec.freerasp.Threat -import com.aheaditec.freerasp.handlers.MethodCallHandler +import app.talsec.rasp.flutter.Threat +import app.talsec.rasp.flutter.handlers.MethodCallHandler import app.talsec.rasp.security.api.SuspiciousAppInfo import app.talsec.rasp.security.api.ThreatListener.CallState import io.flutter.plugin.common.EventChannel.EventSink diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/generated/TalsecPigeonApi.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/generated/TalsecPigeonApi.kt similarity index 99% rename from android/src/main/kotlin/com/aheaditec/freerasp/generated/TalsecPigeonApi.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/generated/TalsecPigeonApi.kt index f81bd94..59636ea 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/generated/TalsecPigeonApi.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/generated/TalsecPigeonApi.kt @@ -2,7 +2,7 @@ // See also: https://pub.dev/packages/pigeon @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") -package com.aheaditec.freerasp.generated +package app.talsec.rasp.flutter.generated import android.util.Log import io.flutter.plugin.common.BasicMessageChannel diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/ExecutionStateStreamHandler.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/ExecutionStateStreamHandler.kt similarity index 96% rename from android/src/main/kotlin/com/aheaditec/freerasp/handlers/ExecutionStateStreamHandler.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/handlers/ExecutionStateStreamHandler.kt index 215f7fd..fee7dfc 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/ExecutionStateStreamHandler.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/ExecutionStateStreamHandler.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp.handlers +package app.talsec.rasp.flutter.handlers import io.flutter.Log import io.flutter.plugin.common.BinaryMessenger diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/MethodCallHandler.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/MethodCallHandler.kt similarity index 98% rename from android/src/main/kotlin/com/aheaditec/freerasp/handlers/MethodCallHandler.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/handlers/MethodCallHandler.kt index 1f2d6a3..d734d7b 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/MethodCallHandler.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/MethodCallHandler.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp.handlers +package app.talsec.rasp.flutter.handlers import android.annotation.SuppressLint import android.app.Activity @@ -10,11 +10,11 @@ import android.os.Looper import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleOwner -import com.aheaditec.freerasp.Utils -import com.aheaditec.freerasp.generated.TalsecPigeonApi -import com.aheaditec.freerasp.resolve -import com.aheaditec.freerasp.runResultCatching -import com.aheaditec.freerasp.toPigeon +import app.talsec.rasp.flutter.Utils +import app.talsec.rasp.flutter.generated.TalsecPigeonApi +import app.talsec.rasp.flutter.resolve +import app.talsec.rasp.flutter.runResultCatching +import app.talsec.rasp.flutter.toPigeon import app.talsec.rasp.security.api.SuspiciousAppInfo import app.talsec.rasp.security.api.Talsec import app.talsec.rasp.security.api.ThreatListener.CallState diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/PluginThreatHandler.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/PluginThreatHandler.kt similarity index 94% rename from android/src/main/kotlin/com/aheaditec/freerasp/handlers/PluginThreatHandler.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/handlers/PluginThreatHandler.kt index b5d2ce8..46e4cd8 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/PluginThreatHandler.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/PluginThreatHandler.kt @@ -1,10 +1,10 @@ -package com.aheaditec.freerasp.handlers +package app.talsec.rasp.flutter.handlers import android.content.Context -import com.aheaditec.freerasp.RaspExecutionStateEvent -import com.aheaditec.freerasp.Threat -import com.aheaditec.freerasp.dispatchers.ExecutionStateDispatcher -import com.aheaditec.freerasp.dispatchers.ThreatDispatcher +import app.talsec.rasp.flutter.RaspExecutionStateEvent +import app.talsec.rasp.flutter.Threat +import app.talsec.rasp.flutter.dispatchers.ExecutionStateDispatcher +import app.talsec.rasp.flutter.dispatchers.ThreatDispatcher import app.talsec.rasp.security.api.SuspiciousAppInfo import app.talsec.rasp.security.api.ThreatListener import app.talsec.rasp.security.api.ThreatListener.CallState diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/StreamHandler.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/StreamHandler.kt similarity index 98% rename from android/src/main/kotlin/com/aheaditec/freerasp/handlers/StreamHandler.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/handlers/StreamHandler.kt index 0156c1c..7b9e1f7 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/StreamHandler.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/StreamHandler.kt @@ -1,4 +1,4 @@ -package com.aheaditec.freerasp.handlers +package app.talsec.rasp.flutter.handlers import io.flutter.Log import io.flutter.plugin.common.BinaryMessenger diff --git a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/TalsecThreatHandler.kt b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/TalsecThreatHandler.kt similarity index 94% rename from android/src/main/kotlin/com/aheaditec/freerasp/handlers/TalsecThreatHandler.kt rename to android/src/main/kotlin/app/talsec/rasp/flutter/handlers/TalsecThreatHandler.kt index 93a3958..bd057fb 100644 --- a/android/src/main/kotlin/com/aheaditec/freerasp/handlers/TalsecThreatHandler.kt +++ b/android/src/main/kotlin/app/talsec/rasp/flutter/handlers/TalsecThreatHandler.kt @@ -1,11 +1,11 @@ -package com.aheaditec.freerasp.handlers +package app.talsec.rasp.flutter.handlers import android.content.Context import android.os.Build -import com.aheaditec.freerasp.RaspExecutionStateEvent -import com.aheaditec.freerasp.ScreenProtector -import com.aheaditec.freerasp.dispatchers.ExecutionStateDispatcher -import com.aheaditec.freerasp.dispatchers.ThreatDispatcher +import app.talsec.rasp.flutter.RaspExecutionStateEvent +import app.talsec.rasp.flutter.ScreenProtector +import app.talsec.rasp.flutter.dispatchers.ExecutionStateDispatcher +import app.talsec.rasp.flutter.dispatchers.ThreatDispatcher import app.talsec.rasp.security.api.Talsec import app.talsec.rasp.security.api.TalsecConfig import io.flutter.plugin.common.EventChannel.EventSink diff --git a/pigeons/talsec_pigeon_api.dart b/pigeons/talsec_pigeon_api.dart index 8e16292..29d2026 100644 --- a/pigeons/talsec_pigeon_api.dart +++ b/pigeons/talsec_pigeon_api.dart @@ -4,9 +4,9 @@ import 'package:pigeon/pigeon.dart'; PigeonOptions( dartOut: 'lib/src/generated/talsec_pigeon_api.g.dart', kotlinOut: - 'android/src/main/kotlin/com/aheaditec/freerasp/generated/TalsecPigeonApi.kt', + 'android/src/main/kotlin/app/talsec/rasp/flutter/generated/TalsecPigeonApi.kt', input: 'pigeons/talsec_pigeon_api.dart', - kotlinOptions: KotlinOptions(package: 'com.aheaditec.freerasp.generated'), + kotlinOptions: KotlinOptions(package: 'app.talsec.rasp.flutter.generated'), ), ) class PackageInfo { diff --git a/pubspec.yaml b/pubspec.yaml index 5dbbbe3..aa109ea 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,7 +36,7 @@ flutter: plugin: platforms: android: - package: com.aheaditec.freerasp + package: app.talsec.rasp.flutter pluginClass: FreeraspPlugin ios: pluginClass: SwiftFreeraspPlugin