Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

feature: used VoiceInteraction API for assistant so it can work without accessibility permission

AKS Labsa70513901539
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33b3a6a..272c4e5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -86,7 +86,7 @@
android:name=".CircleToSearchRecognitionService"
android:label="@string/app_name"
android:exported="true"
- android:permission="android.permission.BIND_VOICE_INTERACTION">
+ android:permission="android.permission.BIND_RECOGNITION_SERVICE">
<intent-filter>
<action android:name="android.speech.RecognitionService" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt b/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt
index 4b15a63..389bf96 100644
--- a/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt
@@ -47,17 +47,9 @@ class AssistSessionService : VoiceInteractionSessionService() {
override fun onShow(args: Bundle?, showFlags: Int) {
super.onShow(args, showFlags)
- android.util.Log.d("AssistSessionService", "onShow called")
- }
-
- override fun onHandleAssist(data: Bundle?, structure: AssistStructure?, content: AssistContent?) {
- android.util.Log.d("AssistSessionService", "onHandleAssist called")
- val prefs = context.getSharedPreferences("app_prefs", Context.MODE_PRIVATE)
- if (!prefs.getBoolean("assistant_enabled", false)) {
- android.util.Log.d("AssistSessionService", "Assistant disabled in prefs, but continuing for debug")
- }
-
- // Haptic feedback
+ android.util.Log.d("AssistSessionService", "onShow called with flags: $showFlags")
+
+ // Haptic feedback to acknowledge the trigger
val vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vibrator.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE))
@@ -65,35 +57,41 @@ class AssistSessionService : VoiceInteractionSessionService() {
@Suppress("DEPRECATION")
vibrator.vibrate(50)
}
+ }
+
+ override fun onHandleAssist(data: Bundle?, structure: AssistStructure?, content: AssistContent?) {
+ super.onHandleAssist(data, structure, content)
+ android.util.Log.d("AssistSessionService", "onHandleAssist called")
+ // This is called for text/structure. We mainly care about the screenshot,
+ // but this is a good place to ensure the overlay starts if onHandleScreenshot is delayed.
+ }
+
+ override fun onHandleScreenshot(screenshot: android.graphics.Bitmap?) {
+ super.onHandleScreenshot(screenshot)
+ android.util.Log.d("AssistSessionService", "onHandleScreenshot received, bitmap null? ${screenshot == null}")
- // Try to trigger capture via AccessibilityService (which handles screenshot & launch)
- try {
- android.util.Log.d("AssistSessionService", "Requesting triggerCapture from AccessibilityService")
- CircleToSearchAccessibilityService.triggerCapture()
- } catch (e: Exception) {
- android.util.Log.e("AssistSessionService", "Failed to trigger AccessibilityService capture", e)
- // Fallback: Launch overlay anyway (might be black, but better than nothing)
- launchOverlayDirectly()
- }
+ // 1. Save screenshot to repository for the overlay to use
+ BitmapRepository.setScreenshot(screenshot)
+
+ // 2. Launch the search overlay activity independently of Accessibility permission
+ launchOverlayDirectly()
- // We can finish the session now as the overlay takes over
+ // 3. We can finish the session now as the overlay takes over
finish()
}
private fun launchOverlayDirectly() {
- BitmapRepository.setScreenshot(null)
- android.util.Log.d("AssistSessionService", "Launching OverlayActivity directly (fallback)")
- val intent = Intent(context, OverlayActivity::class.java)
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+ android.util.Log.d("AssistSessionService", "Launching OverlayActivity")
+ val intent = Intent(context, OverlayActivity::class.java).apply {
+ addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+ // Signal that this was triggered by the assistant session
+ putExtra("triggered_by", "assistant")
+ }
+
try {
- // startVoiceActivity might fail if not allowed, try catch
- try {
- startVoiceActivity(intent)
- } catch (e: SecurityException) {
- android.util.Log.w("AssistSessionService", "startVoiceActivity failed, using startActivity", e)
- context.startActivity(intent)
- }
+ // Using startActivity as an assistant session is allowed to start activities
+ context.startActivity(intent)
} catch (e: Exception) {
android.util.Log.e("AssistSessionService", "Failed to launch OverlayActivity", e)
}
diff --git a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchVoiceService.kt b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchVoiceService.kt
index 4dce087..b9cb06c 100644
--- a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchVoiceService.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchVoiceService.kt
@@ -27,13 +27,13 @@ import android.service.voice.VoiceInteractionService
* The actual assist handling is done by AssistSessionService.
*/
class CircleToSearchVoiceService : VoiceInteractionService() {
- override fun onCreate() {
- super.onCreate()
- android.util.Log.d("CircleToSearchVoiceService", "VoiceService Created")
- }
-
override fun onReady() {
super.onReady()
android.util.Log.d("CircleToSearchVoiceService", "VoiceService Ready")
}
+
+ override fun onShutdown() {
+ super.onShutdown()
+ android.util.Log.d("CircleToSearchVoiceService", "VoiceService Shutdown")
+ }
}
diff --git a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
index d80c204..f9d307b 100644
--- a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
@@ -459,10 +459,10 @@ fun isDefaultAssistant(context: android.content.Context): Boolean {
// A reliable check is to see if we are arguably the voice interaction service.
val assistant = Settings.Secure.getString(context.contentResolver, "voice_interaction_service")
- val component = android.content.ComponentName(context, CircleToSearchRecognitionService::class.java)
+ val component = android.content.ComponentName(context, CircleToSearchVoiceService::class.java)
val myComponentString = component.flattenToString()
- // Fallback: Checks if our service is the one set.
+ // Check if our VoiceInteractionService is the one currently set as default
return assistant == myComponentString
}