Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26502e48 authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Merge branch '3187-listent_murena_groups' into 'main' 

3187 listen to murena groups

See merge request !22
parents f9e74394 bee21489

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ dependencies { 
    implementation 'com.google.code.gson:gson:2.10'



    // Room (SQLite)

    def room_version = "2.6.1"

    def room_version = libs.versions.androidx.room.get()

    implementation "androidx.room:room-runtime:$room_version"

    ksp "androidx.room:room-compiler:$room_version"

    implementation "androidx.room:room-ktx:$room_version"

build.gradle

+2 −2
Original line number Diff line number Diff line 
buildscript {

    ext.kotlin_version = '2.0.21'

    ext.kotlin_version = libs.versions.kotlin.get()

    repositories {

        google()

        mavenCentral()
@@ -15,7 +15,7 @@ buildscript { 
}



plugins {

    id 'com.google.devtools.ksp' version '2.0.21-1.0.27'

    id 'com.google.devtools.ksp' version libs.versions.ksp

    alias(libs.plugins.spotless)

    alias(libs.plugins.hilt.android) apply false

    alias(libs.plugins.detekt) apply false

gradle/libs.versions.toml

+13 −7
Original line number Diff line number Diff line
@@ -3,24 +3,28 @@ app-compileSdk = "35" 
app-minSdk = "31"



androidx-activity-compose = "1.10.1"

androidx-compose-bom = "2025.06.01"

androidx-hilt = "1.2.0"

androidx-lifecycle-runtime-compose = "2.9.2"

androidx-navigation-compose = "2.9.0"

androidx-compose-bom = "2025.09.00"

androidx-hilt = "1.3.0"

androidx-lifecycle-runtime-compose = "2.9.4"

androidx-navigation-compose = "2.9.4"

androidx-room = "2.8.2"

eos-elib = "0.0.2-alpha12"

eos-telemetry = "1.0.1-release"

kotlin = "2.0.21"

eos-userinfo = "1.1.0"

kotlin = "2.2.0"

kotlinx-coroutines = "1.10.2"

kotlinx-serialization-json = "1.9.0"

markwon = "4.6.2"

markwon-compose = "0.5.7"



# Tests

junit = "4.13.2"

mockk = "1.13.12"

mockk = "1.14.5"



# Build

detekt = "1.23.8"

hilt = "2.53.1"

hilt = "2.57.2"

ksp = "2.2.0-2.0.2"

ktlint = "1.6.0"

spotless = "8.0.0"
@@ -42,7 +46,9 @@ dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler" , v 
dagger-hilt-core = { group = "com.google.dagger", name = "hilt-core" , version.ref = "hilt"}

eos-elib = { group = "foundation.e", name = "elib", version.ref  = "eos-elib" }

eos-telemetry = {group = "foundation.e.lib", name = "telemetry", version.ref = "eos-telemetry" }

eos-userinfo = { group = "foundation.e.userinfo", name = "userinfo-lib", version.ref = "eos-userinfo" }

kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name ="kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }

kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }

markwon = { group = "io.noties.markwon", name = "core", version.ref = "markwon" }

markwon-compose = { group = "com.github.jeziellago", name = "compose-markdown", version.ref = "markwon-compose" }

markwon-html = {group = "io.noties.markwon", name = "html", version.ref = "markwon" }

notificationsreceiver-domain/src/main/java/foundation/e/notificationsreceiver/domain/bridges/androidinterfaces/DeviceConfiguration.kt

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ interface DeviceConfiguration { 
    val device: String

    val androidVersion: String

    suspend fun getLang(): String

    suspend fun getMurenaWorkspaceGroups(): List<String>

}

notificationsreceiver-domain/src/main/java/foundation/e/notificationsreceiver/domain/procedures/RegisterToEosNotifications.kt

+4 −0
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ class RegisterToEosNotifications @Inject constructor( 
                .takeIf { it in SUPPORTED_LANGUAGES } ?: DEFAULT_LANG,

        )



        deviceConfiguration.getMurenaWorkspaceGroups().forEach {

            topics.add(it)

        }



        val baseUrl = subscriptionRepository.getBaseUrl()

        return topics.map { Topic(baseUrl = baseUrl, topic = "${EOS_BROADCAST_TOPIC_PREFIX}-$it-$lang") }

    }