devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #202 from ouchadam/bug/android-13-notifications 

Fix missing notifications on android 13
This commit is contained in:
Adam Brown 2022-10-12 23:06:34 +01:00 committed by GitHub
parent aedc56ef59 b8689292c3
commit ab163001db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
domains/android/compose-core/src/main/kotlin/app/dapk/st/core/DapkActivity.kt
View File

@ -75,6 +75,16 @@ abstract class DapkActivity : ComponentActivity(), EffectScope {
}
}
protected fun registerForPermission(permission: String, callback: () -> Unit = {}): () -> Unit {
val resultCallback: (result: Boolean) -> Unit = { result ->
if (result) {
callback()
}
}
val launcher = registerForActivityResult(ActivityResultContracts.RequestPermission(), resultCallback)
return { launcher.launch(permission) }
}
protected suspend fun ensurePermission(permission: String): PermissionResult {
return when {
checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED -> PermissionResult.Granted

1
features/home/src/main/kotlin/app/dapk/st/home/HomeState.kt
View File

@ -21,5 +21,6 @@ sealed interface HomeScreenState {
sealed interface HomeEvent {
object Relaunch : HomeEvent
object OnShowContent : HomeEvent
}

2
features/home/src/main/kotlin/app/dapk/st/home/HomeViewModel.kt
View File

@ -39,6 +39,7 @@ class HomeViewModel(
fun start() {
viewModelScope.launch {
state = if (credentialsProvider.isSignedIn()) {
_events.emit(HomeEvent.OnShowContent)
initialHomeContent()
} else {
SignedOut
@ -62,6 +63,7 @@ class HomeViewModel(
fun loggedIn() {
viewModelScope.launch {
state = initialHomeContent()
_events.emit(HomeEvent.OnShowContent)
listenForInviteChanges()
}
}

13
features/home/src/main/kotlin/app/dapk/st/home/MainActivity.kt
View File

@ -1,5 +1,7 @@
package app.dapk.st.home
import android.Manifest
import android.os.Build
import android.os.Bundle
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.AlertDialog
@ -27,10 +29,11 @@ class MainActivity : DapkActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val pushPermissionLauncher = registerPushPermission()
homeViewModel.events.onEach {
when (it) {
HomeEvent.Relaunch -> recreate()
HomeEvent.OnShowContent -> pushPermissionLauncher?.invoke()
}
}.launchIn(lifecycleScope)
@ -45,6 +48,14 @@ class MainActivity : DapkActivity() {
}
}
private fun registerPushPermission(): (() -> Unit)? {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
registerForPermission(Manifest.permission.POST_NOTIFICATIONS)
} else {
null
}
}
@Composable
private fun BetaUpgradeDialog() {
AlertDialog(

4
features/notifications/src/main/AndroidManifest.xml
View File

@ -1,2 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="app.dapk.st.notifications"/>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="app.dapk.st.notifications">
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
</manifest>