diff options
| author | Iván Ávalos <avalos@disroot.org> | 2023-09-16 01:53:18 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2023-09-16 01:53:18 -0600 |
| commit | 97fee2befcfcbcaa4263e4795680f46bf18d988d (patch) | |
| tree | ce6257c7e57deab1ef03d73cecb5da8a1a987d68 /shared | |
| parent | 073e78859724a122233f6349592a3e6c10f05ed1 (diff) | |
| parent | 6c69520fc2a968cb27d1f751f34a123205936567 (diff) | |
| download | etbsa-trackermap-mobile-97fee2befcfcbcaa4263e4795680f46bf18d988d.tar.gz etbsa-trackermap-mobile-97fee2befcfcbcaa4263e4795680f46bf18d988d.tar.bz2 etbsa-trackermap-mobile-97fee2befcfcbcaa4263e4795680f46bf18d988d.zip | |
Merged upstream
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/build.gradle.kts | 12 | ||||
| -rw-r--r-- | shared/src/androidMain/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/SessionController.kt | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 2488cde..94b8f09 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -8,7 +8,9 @@ kotlin { val ktor_version = "1.6.6" val settings_version = "0.8.1" - android() + androidTarget() + + jvmToolchain(17) listOf( iosX64(), @@ -56,14 +58,18 @@ kotlin { } android { - compileSdk = 31 + compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") defaultConfig { minSdk = 21 - targetSdk = 31 ndk { abiFilters.clear() abiFilters += listOf("armeabi-v7a", "arm64-v8a") } } + namespace = "mx.trackermap.TrackerMap" + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } }
\ No newline at end of file diff --git a/shared/src/androidMain/AndroidManifest.xml b/shared/src/androidMain/AndroidManifest.xml index f480b0f..568741e 100644 --- a/shared/src/androidMain/AndroidManifest.xml +++ b/shared/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest package="mx.trackermap.TrackerMap" />
\ No newline at end of file +<manifest />
\ No newline at end of file diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/SessionController.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/SessionController.kt index 0faaa72..a63bba2 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/SessionController.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/SessionController.kt @@ -138,7 +138,7 @@ class SessionController( private suspend fun unregisterFcmToken(token: String) { print("Unregister FCM token: $token\n") try { - userFlow.value?.let { user -> + sessionApi.sessionGet().let { user -> val attributes = user.attributes.toMutableMap() attributes["notificationTokens"]?.content?.let { tokens -> if (tokens.contains("$token,")) { |