From 66d8e6210d2d522f777631a44ddb4b86e324f7db Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 23 Oct 2025 16:23:01 +0200 Subject: [PATCH] Add default implementation to `SessionListener` --- .../android/features/invite/impl/DefaultSeenInvitesStore.kt | 1 - .../features/lockscreen/impl/DefaultLockScreenService.kt | 2 -- .../android/libraries/matrix/ui/media/ImageLoaderHolder.kt | 2 -- .../impl/store/DefaultSessionPreferencesStoreFactory.kt | 1 - .../element/android/libraries/push/impl/DefaultPushService.kt | 4 ---- .../conversations/DefaultNotificationConversationService.kt | 2 -- .../libraries/sessionstorage/api/observer/SessionListener.kt | 4 ++-- .../services/analytics/impl/DefaultAnalyticsService.kt | 4 ---- 8 files changed, 2 insertions(+), 18 deletions(-) diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt index 5a8a9116d5..c358cbf36f 100644 --- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt +++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt @@ -33,7 +33,6 @@ class DefaultSeenInvitesStore( ) : SeenInvitesStore { init { sessionObserver.addListener(object : SessionListener { - override suspend fun onSessionCreated(userId: String) = Unit override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) { if (sessionId.value == userId) { clear() diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt index 03ac11e086..ffdb4e67ff 100644 --- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt +++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt @@ -77,8 +77,6 @@ class DefaultLockScreenService( */ private fun observeSessionsState() { sessionObserver.addListener(object : SessionListener { - override suspend fun onSessionCreated(userId: String) = Unit - override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) { // TODO handle multi session at some point pinCodeManager.deletePinCode() diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt index 77d3abffef..12cc099eee 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt @@ -35,8 +35,6 @@ class DefaultImageLoaderHolder( private fun observeSessions() { sessionObserver.addListener(object : SessionListener { - override suspend fun onSessionCreated(userId: String) = Unit - override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) { remove(SessionId(userId)) } diff --git a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStoreFactory.kt b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStoreFactory.kt index 07df852208..e2e8c2088a 100644 --- a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStoreFactory.kt +++ b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStoreFactory.kt @@ -30,7 +30,6 @@ class DefaultSessionPreferencesStoreFactory( init { sessionObserver.addListener(object : SessionListener { - override suspend fun onSessionCreated(userId: String) = Unit override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) { val sessionPreferences = cache.remove(SessionId(userId)) sessionPreferences?.clear() diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPushService.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPushService.kt index 8e8874d6ea..f872754827 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPushService.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPushService.kt @@ -108,10 +108,6 @@ class DefaultPushService( sessionObserver.addListener(this) } - override suspend fun onSessionCreated(userId: String) { - // Nothing to do - } - /** * The session has been deleted. * In this case, this is not necessary to unregister the pusher from the homeserver, diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationService.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationService.kt index 43824c88ae..ea282caa6d 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationService.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationService.kt @@ -59,8 +59,6 @@ class DefaultNotificationConversationService( init { sessionObserver.addListener(object : SessionListener { - override suspend fun onSessionCreated(userId: String) = Unit - override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) { onSessionLogOut(SessionId(userId)) } diff --git a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionListener.kt b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionListener.kt index 6066ffd09b..fa6226a5ec 100644 --- a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionListener.kt +++ b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionListener.kt @@ -8,6 +8,6 @@ package io.element.android.libraries.sessionstorage.api.observer interface SessionListener { - suspend fun onSessionCreated(userId: String) - suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) + suspend fun onSessionCreated(userId: String) = Unit + suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) = Unit } diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt index dc6b32ef7d..656373b3a6 100644 --- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt +++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt @@ -75,10 +75,6 @@ class DefaultAnalyticsService( analyticsStore.setAnalyticsId(analyticsId) } - override suspend fun onSessionCreated(userId: String) { - // Nothing to do - } - override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) { // Delete the store when the last session is deleted if (sessionStore.getAllSessions().isEmpty()) {