unimore/pm-2024-steffo-twom
unimore/pm-2024-steffo-twom
1
Fork 0
mirror of https://github.com/Steffo99/twom.git synced 2024-11-21 23:54:26 +00:00
Code Activity

Explicitly declare sessions

Browse source
This commit is contained in:
Steffo 2024-02-04 23:52:04 +01:00
parent 77dd9373e9
commit 172f4ff76b
Signed by: steffo
GPG key ID: 5ADA3868646C3FC0
3 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/steffo/twom/configureroom/activities/ConfigureRoomActivity.kt
View file

@ -8,6 +8,7 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContract
import eu.steffo.twom.configureroom.components.ConfigureRoomScaffold
import eu.steffo.twom.matrix.utils.TwoMMatrix
class ConfigureRoomActivity : ComponentActivity() {
@ -91,6 +92,7 @@ class ConfigureRoomActivity : ComponentActivity() {
setContent {
ConfigureRoomScaffold(
session = TwoMMatrix.session!!,
initialConfiguration = configuration,
)
}

5
app/src/main/java/eu/steffo/twom/configureroom/components/ConfigureRoomScaffold.kt
View file

@ -7,15 +7,14 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
import eu.steffo.twom.configureroom.activities.ConfigureRoomActivity
import eu.steffo.twom.matrix.complocals.LocalSession
import eu.steffo.twom.matrix.utils.TwoMMatrix
import eu.steffo.twom.theme.components.TwoMTheme
import org.matrix.android.sdk.api.session.Session
@Composable
fun ConfigureRoomScaffold(
session: Session,
initialConfiguration: ConfigureRoomActivity.Configuration? = null,
) {
val session = TwoMMatrix.matrix.authenticationService().getLastAuthenticatedSession()!!
TwoMTheme {
CompositionLocalProvider(LocalSession provides session) {
Scaffold(

20
app/src/main/java/eu/steffo/twom/viewroom/activities/ViewRoomActivity.kt
View file

@ -2,14 +2,11 @@ package eu.steffo.twom.viewroom.activities
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContract
import eu.steffo.twom.matrix.utils.TwoMMatrix
import eu.steffo.twom.viewroom.components.ViewRoomScaffold
import org.matrix.android.sdk.api.session.Session
class ViewRoomActivity : ComponentActivity() {
companion object {
@ -26,21 +23,6 @@ class ViewRoomActivity : ComponentActivity() {
override fun parseResult(resultCode: Int, intent: Intent?) {}
}
private lateinit var session: Session
private fun fetchLastSession() {
Log.d("Main", "Fetching the last successfully authenticated session...")
// FIXME: If this is null, it means that something launched this while no session was authenticated...
session = TwoMMatrix.matrix.authenticationService().getLastAuthenticatedSession()!!
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// FIXME: Hopefully, if this succeeds, the session is also open... hopefully.
fetchLastSession()
}
override fun onStart() {
super.onStart()
@ -48,7 +30,7 @@ class ViewRoomActivity : ComponentActivity() {
setContent {
ViewRoomScaffold(
session = session,
session = TwoMMatrix.session!!,
roomId = roomId!!,
)
}