Move Termux permission gate to send action and revert regression

Author: Android-PowerUser

app/src/main/kotlin/com/google/ai/sample/ScreenOperatorAccessibilityService.kt

@@ -145,7 +145,6 @@ class ScreenOperatorAccessibilityService : AccessibilityService() {
     private val handler = Handler(Looper.getMainLooper()) // Instance handler
 
     private var pendingScreenshotDelayMillis: Long = 0L
-    private var sawNonTermuxCommandSinceLastScreenshot: Boolean = false
     private var pendingDelayedScreenshotRunnable: Runnable? = null
 
     // App name to package mapper
@@ -419,35 +418,13 @@ class ScreenOperatorAccessibilityService : AccessibilityService() {
                 }
             }
         }
-            .also { _ ->
-                if (command !is Command.TakeScreenshot && command !is Command.TermuxCommand) {
-                    sawNonTermuxCommandSinceLastScreenshot = true
-                }
-            }
     }
 
     private fun executeTakeScreenshotCommand(): Boolean {
         val delayMillis = pendingScreenshotDelayMillis
         pendingScreenshotDelayMillis = 0L
-        val onlyTermuxContext = !sawNonTermuxCommandSinceLastScreenshot
-
-        if (!isTermuxRunCommandPermissionGranted()) {
-            val denialCount = TermuxFeedbackPreferences.incrementPermissionDenialCount(applicationContext)
-            if (denialCount >= 2) {
-                showToast("Enable Termux permissions in the Android settings", true)
-            }
-            Log.w(TAG, "Blocking screenshot/AI handoff because Termux RUN_COMMAND permission is not granted.")
-            return false
-        } else {
-            TermuxFeedbackPreferences.resetPermissionDenialCount(applicationContext)
-        }
-
         fun buildScreenInfoPayload(rawScreenInfo: String?): String? {
-            val termuxOutput = if (onlyTermuxContext) {
-                TermuxOutputPreferences.peekOutput(applicationContext)?.trim().orEmpty()
-            } else {
-                TermuxOutputPreferences.consumeOutput(applicationContext)?.trim().orEmpty()
-            }
+            val termuxOutput = TermuxOutputPreferences.consumeOutput(applicationContext)?.trim().orEmpty()
             if (termuxOutput.isBlank()) {
                 return rawScreenInfo
             }
@@ -457,7 +434,7 @@ class ScreenOperatorAccessibilityService : AccessibilityService() {
 
         val captureAndRequestScreenshot = {
             val currentModel = GenerativeAiViewModelFactory.getCurrentModel()
-            if (!currentModel.supportsScreenshot || onlyTermuxContext) {
+            if (!currentModel.supportsScreenshot) {
                 Log.d(TAG, "Command.TakeScreenshot: Model has no screenshot support, capturing screen info only.")
                 showToast("Capturing screen info...", false)
                 val screenInfo = buildScreenInfoPayload(captureScreenInformation())
@@ -467,7 +444,6 @@ class ScreenOperatorAccessibilityService : AccessibilityService() {
                     applicationContext,
                     screenInfo
                 )
-                sawNonTermuxCommandSinceLastScreenshot = false
             } else {
                 Log.d(TAG, "Command.TakeScreenshot: Capturing screen info and sending request broadcast to MainActivity.")
                 showToast("Preparing screenshot...", false)
@@ -480,7 +456,6 @@ class ScreenOperatorAccessibilityService : AccessibilityService() {
                 }
                 applicationContext.sendBroadcast(intent)
                 Log.d(TAG, "Sent broadcast ACTION_REQUEST_MEDIAPROJECTION_SCREENSHOT to MainActivity with screenInfo.")
-                sawNonTermuxCommandSinceLastScreenshot = false
             }
         }
 
@@ -501,10 +476,6 @@ class ScreenOperatorAccessibilityService : AccessibilityService() {
         return true
     }
 
-    private fun isTermuxRunCommandPermissionGranted(): Boolean {
-        return checkSelfPermission("com.termux.permission.RUN_COMMAND") == PackageManager.PERMISSION_GRANTED
-    }
-
     private fun cancelPendingDelayedScreenshot() {
         pendingScreenshotDelayMillis = 0L
         pendingDelayedScreenshotRunnable?.let { runnable ->
@@ -622,8 +593,8 @@ class ScreenOperatorAccessibilityService : AccessibilityService() {
             putExtra("com.termux.RUN_COMMAND_PATH", "/data/data/com.termux/files/usr/bin/bash")
             putExtra("com.termux.RUN_COMMAND_ARGUMENTS", arrayOf("-lc", trimmedCommand))
             putExtra("com.termux.RUN_COMMAND_WORKDIR", "/data/data/com.termux/files/home")
-            putExtra("com.termux.RUN_COMMAND_BACKGROUND", false)
-            putExtra("com.termux.RUN_COMMAND_SESSION_ACTION", 1)
+            putExtra("com.termux.RUN_COMMAND_BACKGROUND", true)
+            putExtra("com.termux.RUN_COMMAND_SESSION_ACTION", 0)
             putExtra("com.termux.RUN_COMMAND_RUNNER", "app-shell")
             putExtra("com.termux.RUN_COMMAND_PENDING_INTENT", pendingResultIntent)
             putExtra("com.termux.RUN_COMMAND_BACKGROUND_CUSTOM_LOG_LEVEL", 0)

app/src/main/kotlin/com/google/ai/sample/feature/multimodal/PhotoReasoningScreen.kt

@@ -6,6 +6,7 @@ import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.provider.Settings
 import android.widget.Toast 
+import androidx.core.content.ContextCompat
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
@@ -110,6 +111,7 @@ import com.google.ai.sample.ScreenOperatorAccessibilityService
 import com.google.ai.sample.util.Command
 import com.google.ai.sample.util.SystemMessageEntry
 import com.google.ai.sample.util.SystemMessageEntryPreferences
+import com.google.ai.sample.util.TermuxFeedbackPreferences
 import com.google.ai.sample.util.UriSaver
 import com.google.ai.sample.util.shareTextFile
 import kotlinx.coroutines.Dispatchers
@@ -425,6 +427,28 @@ fun PhotoReasoningScreen(
                                 }
 
                                 if (userQuestion.isNotBlank()) {
+                                    val hasTermuxRunCommandPermission = ContextCompat.checkSelfPermission(
+                                        context,
+                                        "com.termux.permission.RUN_COMMAND"
+                                    ) == android.content.pm.PackageManager.PERMISSION_GRANTED
+                                    if (!hasTermuxRunCommandPermission) {
+                                        val denialCount = TermuxFeedbackPreferences.incrementPermissionDenialCount(context)
+                                        if (denialCount >= 2) {
+                                            Toast.makeText(
+                                                context,
+                                                "Enable Termux permissions in the Android settings",
+                                                Toast.LENGTH_LONG
+                                            ).show()
+                                        } else {
+                                            Toast.makeText(
+                                                context,
+                                                "Please enable Termux run command permissions",
+                                                Toast.LENGTH_LONG
+                                            ).show()
+                                        }
+                                        return@IconButton
+                                    }
+                                    TermuxFeedbackPreferences.resetPermissionDenialCount(context)
                                     onReasonClicked(userQuestion, imageUris.toList())
                                     onUserQuestionChanged("")
                                     imageUris.clear()

app/src/main/kotlin/com/google/ai/sample/util/TermuxOutputPreferences.kt

@@ -27,10 +27,4 @@ object TermuxOutputPreferences {
         }
         return value
     }
-
-    fun peekOutput(context: Context): String? {
-        val prefs = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE)
-        val value = prefs.getString(KEY_PENDING_OUTPUT, "").orEmpty().trim()
-        return value.ifBlank { null }
-    }
 }