Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group 'com.aheaditec.freerasp'
group 'app.talsec.rasp.flutter'
version '1.0-SNAPSHOT'

buildscript {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.aheaditec.freerasp">
package="app.talsec.rasp.flutter">
</manifest>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.aheaditec.freerasp
package app.talsec.rasp.flutter

import android.content.Context
import android.content.pm.PackageInfo
Expand All @@ -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
Expand All @@ -34,21 +34,21 @@ 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 {
return FlutterSuspiciousAppInfo(this.packageInfo.toPigeon(context), this.reasons.toList(), this.permissions?.toList())
}

/**
* 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 {
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.aheaditec.freerasp
package app.talsec.rasp.flutter

import android.app.Activity
import android.content.Context
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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.aheaditec.freerasp
package app.talsec.rasp.flutter

internal sealed class RaspExecutionStateEvent(val value: Int) {
object FastChecksFinished : RaspExecutionStateEvent(187429)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.aheaditec.freerasp
package app.talsec.rasp.flutter

import android.annotation.SuppressLint
import android.app.Activity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.aheaditec.freerasp
package app.talsec.rasp.flutter

/**
* Sealed class to represent the error codes.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.aheaditec.freerasp
package app.talsec.rasp.flutter

import android.content.Context
import android.graphics.Bitmap
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.aheaditec.freerasp.handlers
package app.talsec.rasp.flutter.handlers

import android.annotation.SuppressLint
import android.app.Activity
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions pigeons/talsec_pigeon_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ flutter:
plugin:
platforms:
android:
package: com.aheaditec.freerasp
package: app.talsec.rasp.flutter
pluginClass: FreeraspPlugin
ios:
pluginClass: SwiftFreeraspPlugin