android-apps-mirrors/SimpleX-Chat
0
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2025-06-29 04:39:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

multiplatform: API 33 support (#2631)

Browse source
This commit is contained in:
Stanislav Dmitrenko 2023-06-29 15:17:43 +03:00 • committed by GitHub
parent 0e4376bada
commit 1f50e94bc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/multiplatform/android/build.gradle
View file

@ -5,12 +5,12 @@ plugins {
} }
android { android {
compileSdk 32 compileSdk 33
defaultConfig { defaultConfig {
applicationId "chat.simplex.app" applicationId "chat.simplex.app"
minSdk 26 minSdk 26
targetSdk 32 targetSdk 33
// !!! // !!!
// skip version code after release to F-Droid, as it uses two version codes // skip version code after release to F-Droid, as it uses two version codes
versionCode 129 versionCode 129

1
apps/multiplatform/android/src/main/AndroidManifest.xml
View file

@ -6,6 +6,7 @@
<uses-feature android:name="android.hardware.camera" /> <uses-feature android:name="android.hardware.camera" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.VIDEO_CAPTURE" /> <uses-permission android:name="android.permission.VIDEO_CAPTURE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />

25
apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt
View file

@ -1,5 +1,7 @@
package chat.simplex.app.views.onboarding package chat.simplex.app.views.onboarding
import android.Manifest
import android.os.Build
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.compose.foundation.* import androidx.compose.foundation.*
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
@ -15,11 +17,14 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import chat.simplex.app.R import chat.simplex.app.R
import chat.simplex.app.SimplexApp
import chat.simplex.app.model.ChatModel import chat.simplex.app.model.ChatModel
import chat.simplex.app.model.NtfManager
import chat.simplex.app.ui.theme.* import chat.simplex.app.ui.theme.*
import chat.simplex.app.views.helpers.* import chat.simplex.app.views.helpers.*
import chat.simplex.app.views.usersettings.NotificationsMode import chat.simplex.app.views.usersettings.NotificationsMode
import chat.simplex.app.views.usersettings.changeNotificationsMode import chat.simplex.app.views.usersettings.changeNotificationsMode
import com.google.accompanist.permissions.rememberPermissionState
@Composable @Composable
fun SetNotificationsMode(m: ChatModel) { fun SetNotificationsMode(m: ChatModel) {
@ -47,8 +52,24 @@ fun SetNotificationsMode(m: ChatModel) {
} }
Spacer(Modifier.fillMaxHeight().weight(1f)) Spacer(Modifier.fillMaxHeight().weight(1f))
} }
LaunchedEffect(Unit) { SetNotificationsModeAdditions()
m.controller.ntfManager.createNtfChannelsMaybeShowAlert() }
@Composable
fun SetNotificationsModeAdditions() {
if (Build.VERSION.SDK_INT >= 33) {
val notificationsPermissionState = rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
LaunchedEffect(notificationsPermissionState.hasPermission) {
if (notificationsPermissionState.hasPermission) {
SimplexApp.context.chatModel.controller.ntfManager.createNtfChannelsMaybeShowAlert()
} else {
notificationsPermissionState.launchPermissionRequest()
}
}
} else {
LaunchedEffect(Unit) {
SimplexApp.context.chatModel.controller.ntfManager.createNtfChannelsMaybeShowAlert()
}
} }
} }