add more scripts and restart vpn after it revoked

.github/workflows/firebase-dist.yml

@@ -0,0 +1,64 @@
+name: Build & Upload Debug to Firebase App Distribution
+
+on:
+  push:
+    branches:
+      - test
+  pull_request:
+    branches:
+      - dev
+      - test
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 1️⃣ Checkout code
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # 2️⃣ Set up JDK 17
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      # 3️⃣ Enable Gradle caching
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+        with:
+          cache-read-only: false
+
+      # 4️⃣ Inject google-services.json
+      - name: Create google-services.json
+        run: |
+          echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 --decode > app/google-services.json
+          echo "✅ google-services.json added successfully"
+
+      # 5️⃣ Make gradlew executable
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      # 6️⃣ Build Debug APK
+      - name: Build Debug APK
+        run: ./gradlew assembleDebug
+
+      # 7️⃣ Find the Debug APK
+      - name: Find Debug APK
+        id: find_apk
+        run: |
+          apk_path=$(find app/build/outputs/apk/debug -name "*.apk" | head -n 1)
+          echo "apk_path=$apk_path" >> $GITHUB_OUTPUT
+          echo "✅ Found Debug APK at: $apk_path"
+
+      # 8️⃣ Upload Debug APK to Firebase App Distribution
+      - name: Upload Debug APK to Firebase App Distribution
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        with:
+          appId: ${{ secrets.FIREBASE_APP_ID }}
+          serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
+          groups: qa-testers
+          file: ${{ steps.find_apk.outputs.apk_path }}

README.md

@@ -19,7 +19,6 @@
 
 [![Build & Upload Debug to Firebase App Distribution](https://github.com/mafazaa-org/Ainaa-android/actions/workflows/firebase-dist.yml/badge.svg?branch=feature%2Fgh-action)](https://github.com/mafazaa-org/Ainaa-android/actions/workflows/firebase-dist.yml)
 
-
 </div>
 
 Ainaa is an Android application built with Kotlin, following MVVM architecture and using dependency injection. It provides advanced features such as VPN, accessibility services, overlays, and integrates with Firebase via Google Services.

app/build.gradle.kts

@@ -15,8 +15,8 @@ android {
         applicationId = "com.mafazaa.ainaa"
         minSdk = 26
         targetSdk = 36
-        versionCode = 10
-        versionName = "v0.0.4"
+        versionCode = 19
+        versionName = "v0.0.19"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -46,7 +46,8 @@ android {
 }
 
 dependencies {
-// Compose
+    testImplementation(libs.junit.junit)
+    // Compose
     val composeBom = platform("androidx.compose:compose-bom:2024.09.02")
     implementation(composeBom)
     androidTestImplementation(composeBom)

app/src/main/AndroidManifest.xml

@@ -73,6 +73,10 @@
                 <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <category android:name="android.intent.category.DEFAULT" />
+
+                <action android:name="android.intent.action.USER_PRESENT" />
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
                 <!--For HTC devices-->
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWEROFF" />
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />

app/src/main/java/com/mafazaa/ainaa/AppActivity.kt

@@ -42,6 +42,7 @@ import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
+import com.mafazaa.ainaa.DialogState.BlockApps
 import com.mafazaa.ainaa.data.local.SharedPrefs
 import com.mafazaa.ainaa.data.models.NetworkResult
 import com.mafazaa.ainaa.domain.models.AppInfo
@@ -61,6 +62,7 @@ import com.mafazaa.ainaa.ui.dialog.BlockAppDialog
 import com.mafazaa.ainaa.ui.dialog.ConfirmBlockedDialog
 import com.mafazaa.ainaa.ui.dialog.EnableProtectionDialog
 import com.mafazaa.ainaa.ui.dialog.HowItWorksDialog
+import com.mafazaa.ainaa.ui.dialog.ManageKeywordsDialog
 import com.mafazaa.ainaa.ui.dialog.PermissionDialog
 import com.mafazaa.ainaa.ui.dialog.ReportProblemDialog
 import com.mafazaa.ainaa.ui.protection.EnableProtectionScreen
@@ -74,7 +76,6 @@ import com.mafazaa.ainaa.utils.Constants.SUPPORT_URL
 import com.mafazaa.ainaa.utils.MyLog
 import com.mafazaa.ainaa.utils.getAllApps
 import com.mafazaa.ainaa.utils.hasAccessibilityPermission
-import com.mafazaa.ainaa.utils.hasAdminPermission
 import com.mafazaa.ainaa.utils.hasNotificationPermission
 import com.mafazaa.ainaa.utils.hasOverlayPermission
 import com.mafazaa.ainaa.utils.hasUsageStatsPermission
@@ -103,6 +104,7 @@ sealed interface DialogState {
     // Keeps Block Apps dialog open, and optionally shows a nested confirm dialog for a selected app
     data class BlockApps(val confirmApp: AppInfo? = null) : DialogState
     data object HowItWorks : DialogState
+    data object BlockWords : DialogState
     data class EnableProtectionConfirm(val level: DnsProtectionLevel) :
         DialogState
 }
@@ -121,6 +123,7 @@ class AppActivity : ComponentActivity() {
     private var overlayPermission by mutableStateOf(false)
     private var usageStatsPermission by mutableStateOf(false)
     private var accessibilityPermission by mutableStateOf(false)
+    private var permissionState by mutableStateOf<PermissionState?>(null)
     private var notificationPermission by mutableStateOf(
         Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
     )
@@ -136,13 +139,6 @@ class AppActivity : ComponentActivity() {
     {
         // Handle result if needed
     }
-    private val permissionChain = listOf(
-        PermissionState.Accessibility,
-        PermissionState.Overlay,
-        PermissionState.Administrative,
-        PermissionState.Vpn,
-        PermissionState.Notification,
-    )
 
     override fun onCreate(savedInstanceState: Bundle?) {
         setLayoutDirection(window.decorView, ViewCompat.LAYOUT_DIRECTION_RTL)
@@ -157,6 +153,7 @@ class AppActivity : ComponentActivity() {
         val viewModel: AppViewModel = getViewModel()
         val sharedPrefs: SharedPrefs by inject(SharedPrefs::class.java)
         viewModel.loadInstalledApps(getAllApps())
+        viewModel.loadBlockedWords()
         MyLog.i(TAG, "Opening app")
         //viewModel.handleUpdateStatus(this)
         refreshPermissionState()
@@ -184,6 +181,7 @@ class AppActivity : ComponentActivity() {
     ) {
         val snackbarHostState = remember { SnackbarHostState() }
         val apps = viewModel.apps.collectAsState().value
+        val blockedWords = viewModel.blockedWords.collectAsState().value
 
         // Centralized dialogs rendering
         when (val d = dialogState) {
@@ -244,16 +242,16 @@ class AppActivity : ComponentActivity() {
                     onDismiss = { dialogState = null },
                     appStates = apps,
                     onBlockClick = { app ->
-                        dialogState = DialogState.BlockApps(confirmApp = app)
+                        dialogState = BlockApps(confirmApp = app)
                     }
                 )
                 if (d.confirmApp != null) {
                     ConfirmBlockedDialog(
                         app = d.confirmApp,
-                        onDismiss = { dialogState = DialogState.BlockApps() },
+                        onDismiss = { dialogState = BlockApps() },
                         onConfirm = {
                             viewModel.toggleAppSelection(it.packageName)
-                            dialogState = DialogState.BlockApps()
+                            dialogState = BlockApps()
                         }
                     )
                 }
@@ -273,27 +271,35 @@ class AppActivity : ComponentActivity() {
                     onConfirm = {
                         dialogState = null // Close the confirmation dialog
                         viewModel.saveLevel(d.level)
-
-                        val nextPermission = findNextMissingPermission()
-                        if (nextPermission == null) {
+                        refreshPermissionState()
+                        if (permissionState == null) {
                             // All permissions are already granted! Activate protection.
                             Toast.makeText(
                                 context,
                                 context.getString(R.string.protection_activated_text),
                                 Toast.LENGTH_LONG
                             ).show()
                             startAccessibilityService(MyAccessibilityService.ACTION_START_FOREGROUND)
-                            startVpnService( MyAccessibilityService.ACTION_START_FOREGROUND)
+                            startVpnService(MyVpnService.ACTION_START)
                             backStack.add(Screen.ProtectionActivated)
                             backStack.remove(Screen.EnableProtection)
                         } else {
-                            dialogState = DialogState.Permission(nextPermission)
+                            dialogState = DialogState.Permission(permissionState!!)
                         }
                     },
                     onDismiss = { dialogState = null }
                 )
             }
 
+            DialogState.BlockWords -> {
+                ManageKeywordsDialog(
+                    keywords = blockedWords.toSet(),
+                    onDismiss = { dialogState = null },
+                    onAddKeyword = { viewModel.addBlockedWord(it) },
+                    onRemoveKeyword = {})
+
+            }
+
             null -> {}
         }
 
@@ -356,6 +362,7 @@ class AppActivity : ComponentActivity() {
                                 onBlockAppClick = { dialogState = DialogState.BlockApps() },
                                 onReportClick = { dialogState = DialogState.ReportProblem },
                                 onConfirmProtectionClick = { dialogState = DialogState.HowItWorks },
+                                onBlockWordClicked = { dialogState = DialogState.BlockWords },
                                 onUpdateClick = { updateStatus ->
                                     when (updateStatus) {
                                         UpdateState.Downloaded -> {
@@ -378,15 +385,22 @@ class AppActivity : ComponentActivity() {
                         }
 
                         Screen.Support -> NavEntry(key) {
+                            var isBlocking by remember {
+                                mutableStateOf(MyAccessibilityService.isRunning)
+                            }
                             SupportScreen(
                                 onSupportClick = { openUrl(SUPPORT_URL) },
                                 onJoinClick = { openUrl(JOIN_URL) },
                                 onShareLogFile = { this@AppActivity.shareFile(viewModel.getLogFile()) },
-                                onStopBlocking = { startAccessibilityService(MyAccessibilityService.ACTION_STOP) },
+                                onStopBlocking = {
+                                    MyAccessibilityService.isRunning =
+                                        !MyAccessibilityService.isRunning
+                                },
                                 onOpenScreenShotWindow = {
                                     viewModel.showScreenshotOverlay(true)
 
-                                }
+                                },
+                                isBlocking = isBlocking
                             )
                         }
 
@@ -440,54 +454,22 @@ class AppActivity : ComponentActivity() {
         if (!accessibilityPermission) {
             accessibilityPermission = hasAccessibilityPermission()
         }
+        permissionState = when {
+            !notificationPermission -> PermissionState.Notification
+            !vpnPermission -> PermissionState.Vpn
+            !overlayPermission -> PermissionState.Overlay
+            !accessibilityPermission -> PermissionState.Accessibility
+            else -> null
+        }
 
     }
 
-    private fun findNextMissingPermission(): PermissionState? {
-        // Check permissions in the defined order
-        return permissionChain.firstOrNull { permission ->
-            !when (permission) {
-                PermissionState.Overlay -> hasOverlayPermission()
-                PermissionState.Accessibility -> hasAccessibilityPermission()
-                PermissionState.Administrative -> hasAdminPermission(adminReceiver)
-                PermissionState.Vpn -> hasVpnPermission()
-                PermissionState.Notification -> hasNotificationPermission()
-                PermissionState.Granted -> true
-            }
-        }
-    }
 
-    private fun checkAndContinuePermissionLoop() {
-        val nextPermission = findNextMissingPermission()
-        if (nextPermission != null) {
-            // If the user is still in the process and another permission is needed, show the next dialog.
-            // We only show it if a permission dialog isn't already showing.
-            if (dialogState == null) {
-                dialogState = DialogState.Permission(nextPermission)
-            }
-        } else {
-            // No more missing permissions!
-            // Check if the service isn't running yet, then activate.
-            if (!isServiceRunning(this, MyAccessibilityService::class.java)) {
-                Toast.makeText(
-                    this,
-                    getString(R.string.protection_activated_message)
-                        .trimIndent(),
-                    Toast.LENGTH_SHORT
-                ).show()
-                startAccessibilityService(MyAccessibilityService.ACTION_START_FOREGROUND)
-                startVpnService(MyAccessibilityService.ACTION_START_FOREGROUND)
-                backStack.add(Screen.ProtectionActivated)
-                backStack.remove(Screen.EnableProtection)
-            }
-        }
-    }
 
 
     override fun onResume() {
         super.onResume()
         refreshPermissionState()
-        checkAndContinuePermissionLoop()
     }
 
 

app/src/main/java/com/mafazaa/ainaa/data/local/RealFileRepo.kt

@@ -22,7 +22,7 @@ class RealFileRepo(val context: Context) : FileRepo {
 
     override fun saveToLog(content: String, fileName: String) {
         val logFile = getLogFile(fileName)
-        logFile.appendText(content)
+        logFile.appendText(content, Charsets.UTF_8)
     }
 
     override fun getUpdateFile(): File = File(

app/src/main/java/com/mafazaa/ainaa/data/local/SharedPrefs.kt

@@ -9,6 +9,11 @@ class SharedPrefs(sharedPreferences: SharedPreferences) {
      */
     var blockedApps by sharedPreferences.delegates.stringSet()
 
+    /**
+     * Set of blocked words.
+     */
+    var blockedWords by sharedPreferences.delegates.stringSet()
+
     var dnsProtectionLevel by sharedPreferences.delegates.protectionLevel()
 
     /**

app/src/main/java/com/mafazaa/ainaa/domain/models/BlockReason.kt

@@ -16,4 +16,9 @@ sealed class BlockReason {
             return "محاولة تعطيل التطبيق:  \n$codeName"
         }
     }
+    data class BlockedWordDetected(val keyword: String, val sentence: String) : BlockReason() {
+        override fun getName(): String {
+            return "كلمة محظورة مكتشفة:  \n$keyword"
+        }
+    }
 }

app/src/main/java/com/mafazaa/ainaa/domain/models/ScreenAnalysis.kt

@@ -1,5 +1,7 @@
 package com.mafazaa.ainaa.domain.models
 
+import com.google.gson.Gson
+
 data class ScreenAnalysis(
     /**
      * the package name of the app currently in foreground
@@ -22,8 +24,11 @@ data class ScreenAnalysis(
      */
     val isSettingsScreen: Boolean,
     val root: ScreenNode,
-    val allTexts: List<String>
 ) {
+    fun toJson():String {
+        val gson = Gson()
+        return gson.toJson(this)
+    }
     override fun toString(): String {
         return "nodes:$nodesCount, app:$pkg, has our app name:$hasAppName,is a settings screen:$isSettingsScreen" +
                 "\n" + root.toString()