Permissions correctly requested

Author: rlazo

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/MainActivity.kt

@@ -44,14 +44,7 @@ class MainActivity : ComponentActivity() {
     @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if(ContextCompat.checkSelfPermission(this,
-                Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.RECORD_AUDIO), 1)
-        }
-        if(ContextCompat.checkSelfPermission(this,
-                Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA), 1)
-        }
+
         enableEdgeToEdge()
         catImage = BitmapFactory.decodeResource(applicationContext.resources, R.drawable.cat)
         setContent {

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/BidiViewModel.kt

@@ -1,4 +1,4 @@
-package com.google.firebase.quickstart.ai.feature.media.imagen
+package com.google.firebase.quickstart.ai.feature.live
 
 import android.Manifest
 import android.graphics.Bitmap
@@ -73,7 +73,7 @@ class BidiViewModel(
         return FunctionResponsePart("fetchWeather", response, fetchWeatherCall.id)
     }
 
-    @RequiresPermission(Manifest.permission.RECORD_AUDIO)
+    
     suspend fun startConversation() {
         liveSession.startAudioConversation(::handler)
     }
@@ -82,9 +82,7 @@ class BidiViewModel(
         liveSession.stopAudioConversation()
     }
 
-// ... (imports and class definition)
-
-    @RequiresPermission(android.Manifest.permission.RECORD_AUDIO)
+    
     fun sendVideoFrame(frame: Bitmap) {
         viewModelScope.launch {
             // Directly compress the Bitmap to a ByteArray

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/StreamRealtimeScreen.kt

@@ -32,8 +32,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.mutableStateOf
 
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.firebase.quickstart.ai.feature.media.imagen.BidiViewModel
-import com.google.firebase.quickstart.ai.feature.media.imagen.ImagenViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/StreamRealtimeVideoScreen.kt

@@ -1,18 +1,31 @@
 package com.google.firebase.quickstart.ai.feature.live
 
 import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresPermission
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.firebase.quickstart.ai.feature.media.imagen.BidiViewModel
+import com.google.firebase.quickstart.ai.feature.live.BidiViewModel
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 
@@ -26,9 +39,42 @@ fun StreamRealtimeVideoScreen(bidiView: BidiViewModel = viewModel<BidiViewModel>
         MaterialTheme.colorScheme.background
 
     val scope = rememberCoroutineScope()
-    DisposableEffect(Unit) {
-        scope.launch {
-            bidiView.startConversation()
+
+    val context = LocalContext.current
+    var hasPermissions by remember {
+        mutableStateOf(
+            ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.CAMERA
+            ) == PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.RECORD_AUDIO
+            ) == PackageManager.PERMISSION_GRANTED
+        )
+    }
+
+    val launcher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions()
+    ) { permissions ->
+        hasPermissions = permissions.values.all { it }
+    }
+
+    LaunchedEffect(Unit) {
+        if (!hasPermissions) {
+            launcher.launch(
+                arrayOf(
+                    Manifest.permission.CAMERA,
+                    Manifest.permission.RECORD_AUDIO
+                )
+            )
+        }
+    }
+
+    DisposableEffect(hasPermissions) {
+        if (hasPermissions) {
+            scope.launch {
+                bidiView.startConversation()
+            }
         }
         onDispose {
             bidiView.endConversation()
@@ -39,16 +85,22 @@ fun StreamRealtimeVideoScreen(bidiView: BidiViewModel = viewModel<BidiViewModel>
         modifier = Modifier.fillMaxSize(),
         color = backgroundColor
     ) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-        ) {
-            CameraView(
-                modifier = Modifier.fillMaxHeight(0.5f),
-                onFrameCaptured = { bitmap ->
-                    bidiView.sendVideoFrame(bitmap)
+        Column(modifier = Modifier.fillMaxSize()) {
+            if (hasPermissions) {
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                ) {
+                    CameraView(
+                        modifier = Modifier.fillMaxHeight(0.5f),
+                        onFrameCaptured = { bitmap ->
+                            bidiView.sendVideoFrame(bitmap)
+                        }
+                    )
                 }
-            )
+            } else {
+                Text("Camera and audio permissions are required to use this feature.")
+            }
         }
     }
 }