First test passed

Author: bakad3v

app/src/main/AndroidManifest.xml

@@ -36,7 +36,7 @@
        </intent-filter>
      </activity>
      <service
-       android:name=".presentation.services.PasswordReceiverService"
+       android:name=".presentation.services.TriggerReceiverService"
        android:exported="true"
        android:directBootAware="true"
        android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">

…tion/services/PasswordReceiverService.kt …ation/services/TriggerReceiverService.ktapp/src/main/java/com/android/aftools/presentation/services/PasswordReceiverService.kt renamed to app/src/main/java/com/android/aftools/presentation/services/TriggerReceiverService.kt app/src/main/java/com/android/aftools/presentation/services/PasswordReceiverService.kt renamed to app/src/main/java/com/android/aftools/presentation/services/TriggerReceiverService.kt

@@ -9,11 +9,9 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.hardware.usb.UsbManager
 import android.os.UserManager
-import android.util.Log
 import android.view.accessibility.AccessibilityEvent
 import com.android.aftools.domain.entities.UsbSettings
 import com.android.aftools.domain.usecases.button.ButtonClickUseCase
-import com.android.aftools.domain.usecases.button.GetButtonSettingsUseCase
 import com.android.aftools.domain.usecases.passwordManager.CheckPasswordUseCase
 import com.android.aftools.domain.usecases.passwordManager.GetPasswordStatusUseCase
 import com.android.aftools.domain.usecases.settings.GetSettingsUseCase
@@ -36,7 +34,7 @@ import javax.inject.Inject
  * Accessibility service for password interception and usb connections monitoring. Thanks x13a for idea.
  */
 @AndroidEntryPoint
-class PasswordReceiverService : AccessibilityService() {
+class TriggerReceiverService : AccessibilityService() {
     private var keyguardManager: KeyguardManager? = null
     private var password = mutableListOf<Char>()
 
@@ -95,7 +93,7 @@ class PasswordReceiverService : AccessibilityService() {
 
     private fun listenButtonClicked() {
         val screenStateChangedFilter =
-            IntentFilter(Intent.ACTION_SCREEN_ON).apply {addAction(Intent.ACTION_SCREEN_OFF) }
+            IntentFilter(Intent.ACTION_SCREEN_ON).apply { addAction(Intent.ACTION_SCREEN_OFF) }
         val buttonClickedReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
                 coroutineScope.launch {

app/src/main/java/com/android/aftools/presentation/viewmodels/SettingsVM.kt

@@ -773,7 +773,7 @@ class SettingsVM @Inject constructor(
     }
 
     fun showRebootOnUSBDialog() {
-        if (permissionsState.value.isAdmin || permissionsState.value.isOwner)
+        if (permissionsState.value.isRoot || permissionsState.value.isOwner)
             showQuestionDialog(title = UIText.StringResource(R.string.reboot_on_usb),
                 message = UIText.StringResource(R.string.reboot_on_usb_long),
                 requestKey = REBOOT_ON_USB_DIALOG)

app/src/main/res/values/strings.xml

@@ -241,7 +241,7 @@
   <string name="save_root_command">Save root command</string>
     <string name="edit_command">Edit root command</string>
     <string name="enter_root_commands">Enter root commands here</string>
-    <string name="enable_root_command_long">If you activate trigger, these commands will be started.</string>
+    <string name="enable_root_command_long">If you activate trigger, these commands will run after data deletion.</string>
   <string name="no_root_rights_commands">You need root rights to run root commands</string>
     <string name="running_root_command">Running root command: %1$s</string>
     <string name="root_command_failed">Root command failed: %1$s</string>
@@ -256,15 +256,15 @@
   <string name="disabling_admin_failed">Disabling admin rights failed</string>
     <string name="power_button_settings">Power button settings</string>
   <string name="destroy_on_button">Run on button clicks</string>
-  <string name="clicks_number">Allowed number of clicks</string>
+  <string name="clicks_number">Number of clicks</string>
   <string name="latency_text">Clicks latency (ms)</string>
   <string name="change_button_latency">Change button latency\n</string>
   <string name="button_latency_long">Setup max latency between clicks in one sequence of clicks (in milliseconds). Default: 1000ms.</string>
   <string name="change_clicks_number">Set power button clicks number</string>
   <string name="clicks_number_long">Setup number of power button clicks in row for launching data destruction</string>
     <string name="reboot_on_connection">Reboot on connection</string>
     <string name="destroy_on_button_title">Destroy data on power button clicks?</string>
-    <string name="destroy_on_button_long">If you activate this option, pressing the phone\'s power off button a certain number of times in a row will delete the data. Requires accessibility service.</string>
+    <string name="destroy_on_button_long"><![CDATA[<p>If you activate this option, pressing the phone\'s power off button a certain number of times in a row will delete the data. <strong>Warning: any switching on/off of the screen is counted as a click, so be careful!</strong> Requires accessibility service.</p>]]></string>
     <string name="reboot_on_usb">Reboot on usb connection?</string>
   <string name="reboot_on_usb_long">If you activate this option, the device will reboot on usb connection, thus entering BFU mode and making it more difficult to hack the device. Requires root or dhizuku.</string>
     <string name="when_usb_connected">When USB connected...</string>