Merge pull request #1031 from tunjid/bugfix/2.0.2

Bugfix/2.0.2

Author: tunjid

.github/workflows/publish.yml

@@ -7,7 +7,7 @@ jobs:
   publish-android-app:
     runs-on: ubuntu-latest
     permissions:
-      contents: 'read'
+      contents: 'write'
       id-token: 'write'
     steps:
       - name: Checkout Code

composeApp/src/androidMain/kotlin/com/tunjid/heron/MainActivity.kt

@@ -48,7 +48,7 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen().apply {
-            setKeepOnScreenCondition(appState::isShowingSplashScreen)
+            setKeepOnScreenCondition(appState::showPlatformSplashScreen)
             setOnExitAnimationListener(SplashScreenViewProvider::remove)
         }
         enableEdgeToEdge()

data/core/src/commonMain/kotlin/com/tunjid/heron/data/network/NetworkService.kt

@@ -16,17 +16,16 @@
 
 package com.tunjid.heron.data.network
 
+import com.tunjid.heron.data.core.types.AtProtoException
 import com.tunjid.heron.data.lexicons.BlueskyApi
 import com.tunjid.heron.data.lexicons.XrpcBlueskyApi
-import com.tunjid.heron.data.utilities.AtProtoException
 import com.tunjid.heron.data.utilities.mapCatchingUnlessCancelled
 import com.tunjid.heron.data.utilities.runCatchingWithNetworkRetry
 import dev.zacsweers.metro.Inject
 import io.ktor.client.HttpClient
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
-import kotlinx.coroutines.currentCoroutineContext
 import sh.christian.ozone.api.response.AtpResponse
 
 internal interface NetworkService {

data/core/src/commonMain/kotlin/com/tunjid/heron/data/network/SessionManager.kt

@@ -22,6 +22,8 @@ import com.atproto.server.RefreshSessionResponse
 import com.tunjid.heron.data.core.models.OauthUriRequest
 import com.tunjid.heron.data.core.models.Server
 import com.tunjid.heron.data.core.models.SessionRequest
+import com.tunjid.heron.data.core.types.AtProtoException
+import com.tunjid.heron.data.core.types.InvalidTokenException
 import com.tunjid.heron.data.core.types.ProfileId
 import com.tunjid.heron.data.lexicons.XrpcBlueskyApi
 import com.tunjid.heron.data.lexicons.XrpcSerializersModule
@@ -33,10 +35,8 @@ import com.tunjid.heron.data.network.oauth.OAuthToken
 import com.tunjid.heron.data.repository.SavedState
 import com.tunjid.heron.data.repository.SavedStateDataSource
 import com.tunjid.heron.data.repository.signedInAuth
-import com.tunjid.heron.data.utilities.AtProtoException
 import com.tunjid.heron.data.utilities.Collections
 import com.tunjid.heron.data.utilities.DeferredMutex
-import com.tunjid.heron.data.utilities.InvalidTokenException
 import com.tunjid.heron.data.utilities.runCatchingUnlessCancelled
 import dev.zacsweers.metro.Inject
 import io.ktor.client.HttpClient
@@ -62,16 +62,13 @@ import io.ktor.http.encodedPath
 import io.ktor.http.isSuccess
 import io.ktor.http.set
 import io.ktor.http.takeFrom
-import io.ktor.util.collections.ConcurrentMap
 import kotlin.time.Clock
 import kotlin.time.Duration.Companion.seconds
-import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.withTimeout
 import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.serialization.json.Json
 import sh.christian.ozone.api.Handle

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/NotificationsRepository.kt

@@ -404,10 +404,9 @@ internal class OfflineNotificationsRepository @Inject constructor(
     override suspend fun resolvePushNotification(
         query: NotificationsQuery.Push,
     ): Result<Notification> =
-        savedStateDataSource.inCurrentProfileSession { signedInProfileId ->
-            if (signedInProfileId == null) {
-                return@inCurrentProfileSession expiredSessionResult()
-            }
+        // Push notifications can be received for any profile that has been signed in
+        savedStateDataSource.inPastSession(query.recordUri.profileId()) { token ->
+            val signedInProfileId = token.authProfileId
 
             recordResolver.resolve(query.recordUri)
                 .mapCatchingUnlessCancelled { resolvedRecord ->

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/RecordRepository.kt

@@ -46,7 +46,9 @@ import com.tunjid.heron.data.core.types.LabelerUri
 import com.tunjid.heron.data.core.types.ListUri
 import com.tunjid.heron.data.core.types.PostUri
 import com.tunjid.heron.data.core.types.ProfileId
+import com.tunjid.heron.data.core.types.RecordUri
 import com.tunjid.heron.data.core.types.StarterPackUri
+import com.tunjid.heron.data.core.utilities.Outcome
 import com.tunjid.heron.data.database.daos.FeedGeneratorDao
 import com.tunjid.heron.data.database.daos.LabelDao
 import com.tunjid.heron.data.database.daos.ListDao
@@ -119,6 +121,10 @@ interface RecordRepository {
     suspend fun updateGrazeFeed(
         update: GrazeFeed.Update,
     ): Result<GrazeFeed>
+
+    suspend fun deleteRecord(
+        uri: RecordUri,
+    ): Outcome
 }
 
 internal class OfflineRecordRepository @Inject constructor(
@@ -376,6 +382,13 @@ internal class OfflineRecordRepository @Inject constructor(
             }
         }
     } ?: expiredSessionResult()
+
+    override suspend fun deleteRecord(
+        uri: RecordUri,
+    ): Outcome = savedStateDataSource.inCurrentProfileSession { signedInProfileId ->
+        if (signedInProfileId == null) return@inCurrentProfileSession expiredSessionOutcome()
+        recordResolver.deleteRecord(uri)
+    } ?: expiredSessionOutcome()
 }
 
 private suspend fun NetworkService.updateFeedRecord(
@@ -393,7 +406,8 @@ private suspend fun NetworkService.updateFeedRecord(
                     record = BskyFeed(
                         did = Did(GrazeDid.id),
                         displayName = editableFeed?.displayName ?: "Graze Feed",
-                        description = editableFeed?.description ?: "A custom feed created with \uD80C\uDD63 and \uD83D\uDC2E",
+                        description = editableFeed?.description
+                            ?: "A custom feed created with \uD80C\uDD63 and \uD83D\uDC2E",
                         createdAt = Clock.System.now(),
                         contentMode = response.contentMode,
                     ).asJsonContent(BskyFeed.serializer()),

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/SavedStateDataSource.kt

@@ -24,6 +24,7 @@ import com.tunjid.heron.data.core.models.NotificationPreferences
 import com.tunjid.heron.data.core.models.Preferences
 import com.tunjid.heron.data.core.models.Server
 import com.tunjid.heron.data.core.models.SessionSummary
+import com.tunjid.heron.data.core.types.ExpiredSessionException
 import com.tunjid.heron.data.core.types.ProfileHandle
 import com.tunjid.heron.data.core.types.ProfileId
 import com.tunjid.heron.data.core.utilities.Outcome
@@ -59,7 +60,6 @@ import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoBuf
 import okio.FileSystem
-import okio.IOException
 import okio.Path
 import sh.christian.ozone.api.model.JsonContent
 
@@ -565,5 +565,3 @@ internal suspend inline fun <T> SavedStateDataSource.inPastSession(
 internal fun expiredSessionOutcome() = Outcome.Failure(ExpiredSessionException())
 
 internal fun <T> expiredSessionResult() = Result.failure<T>(ExpiredSessionException())
-
-private class ExpiredSessionException : IOException()