TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 02:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Making sure camera perm updates in QR and new string for rationale dialog

Browse Source
This commit is contained in:
ThomasSession 2024-09-13 11:49:12 +10:00
parent bdbc2c1e50
commit 74787f949c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt
View File

@ -65,7 +65,7 @@ object RationaleDialog {
text(message) text(message)
} }
button(R.string.theContinue) { onPositive.run() } button(R.string.theContinue) { onPositive.run() }
button(R.string.notNow) { onNegative.run() } button(R.string.cancel) { onNegative.run() }
} }
} }
} }

8
app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt
View File

@ -49,6 +49,9 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView import androidx.compose.ui.viewinterop.AndroidView
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.google.accompanist.permissions.ExperimentalPermissionsApi
import com.google.accompanist.permissions.isGranted
import com.google.accompanist.permissions.rememberPermissionState
import com.google.zxing.BinaryBitmap import com.google.zxing.BinaryBitmap
import com.google.zxing.ChecksumException import com.google.zxing.ChecksumException
import com.google.zxing.FormatException import com.google.zxing.FormatException
@ -75,6 +78,7 @@ import java.util.concurrent.Executors
private const val TAG = "NewMessageFragment" private const val TAG = "NewMessageFragment"
@OptIn(ExperimentalPermissionsApi::class)
@Composable @Composable
fun QRScannerScreen( fun QRScannerScreen(
errors: Flow<String>, errors: Flow<String>,
@ -93,11 +97,11 @@ fun QRScannerScreen(
val context = LocalContext.current val context = LocalContext.current
val permission = Manifest.permission.CAMERA val permission = Manifest.permission.CAMERA
val cameraPermissionState = rememberPermissionState(permission)
var showCameraPermissionDialog by remember { mutableStateOf(false) } var showCameraPermissionDialog by remember { mutableStateOf(false) }
if (ContextCompat.checkSelfPermission(context, permission) if (cameraPermissionState.status.isGranted) {
== PackageManager.PERMISSION_GRANTED) {
ScanQrCode(errors, onScan) ScanQrCode(errors, onScan)
} else { } else {
Column( Column(