From f2a5dde7617c002c9602a2efb4fff0ce2ce94d58 Mon Sep 17 00:00:00 2001
From: evgeny <evgeny@adaptto.ru>
Date: Mon, 12 Oct 2026 02:02:48 +0200
Subject: [PATCH] Declare stream camera permissions and cancel capture at core
 restart

---
 tools/chatgui-android/app/src/main/AndroidManifest.xml    | 3 +++
 .../app/src/main/java/com/utun/chat/data/NativeLib.kt     | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/chatgui-android/app/src/main/AndroidManifest.xml b/tools/chatgui-android/app/src/main/AndroidManifest.xml
index 59fb4b41..c04eadf9 100644
--- a/tools/chatgui-android/app/src/main/AndroidManifest.xml
+++ b/tools/chatgui-android/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -83,6 +84,8 @@
             android:exported="false"
             android:foregroundServiceType="phoneCall|microphone" />
 
+        <service android:name=".data.StreamService" android:exported="false" android:foregroundServiceType="camera|microphone" />
+
         <service
             android:name=".data.UtunConnectionService"
             android:exported="true"
diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/data/NativeLib.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/NativeLib.kt
index a80328a1..ae23b6ac 100644
--- a/tools/chatgui-android/app/src/main/java/com/utun/chat/data/NativeLib.kt
+++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/NativeLib.kt
@@ -43,7 +43,7 @@ object NativeLib {
 
     fun stop() {
         runBlocking(Dispatchers.Main.immediate) {
-            CallController.reset(); ChatApplication.instance.avatars.stop(); ChatApplication.instance.memberFiles.cancel()
+            StreamController.reset(); CallController.reset(); ChatApplication.instance.avatars.stop(); ChatApplication.instance.memberFiles.cancel()
         }
         if (!isReady()) return
         nativeStop()
@@ -58,7 +58,7 @@ object NativeLib {
 
     fun destroy() {
         runBlocking(Dispatchers.Main.immediate) {
-            CallController.reset(); ChatApplication.instance.avatars.stop(); ChatApplication.instance.memberFiles.cancel()
+            StreamController.reset(); CallController.reset(); ChatApplication.instance.avatars.stop(); ChatApplication.instance.memberFiles.cancel()
         }
         nativeDestroy()
         runBlocking(Dispatchers.Main.immediate) { ChatApplication.instance.memberFiles.coreStopped() }
@@ -66,7 +66,7 @@ object NativeLib {
 
     fun restart(dbPath: String, controlPort: Int, configText: String): Boolean {
         runBlocking(Dispatchers.Main.immediate) {
-            CallController.reset(); ChatApplication.instance.avatars.stop(); ChatApplication.instance.memberFiles.cancel()
+            StreamController.reset(); CallController.reset(); ChatApplication.instance.avatars.stop(); ChatApplication.instance.memberFiles.cancel()
         }
         return nativeRestart(configText)
     }
@@ -172,7 +172,7 @@ object NativeLib {
 
     /* ── Voice recording ── */
     fun voiceStart(channelId: String, replyTo: String = "", requestId: Long = 0): Boolean =
-        nativeVoiceStart(channelId, messageIdBytes(replyTo), requestId)
+        !StreamController.blocksCapture() && nativeVoiceStart(channelId, messageIdBytes(replyTo), requestId)
     fun voiceFeed(samples: ShortArray): Boolean = nativeVoiceFeed(samples)
     fun voiceStop(): Int = nativeVoiceStop()
     fun voiceCancel() { nativeVoiceCancel() }