Merge pull request #380 from vector-im/feature/rs_crash_steve

Fix a crash in notificationwhen display name is empty
2024-11-24 10:25:35 +03:00 · 2019-07-17 14:22:45 +02:00 · 2019-07-17 14:22:45 +02:00 · 8e78d8a58d
commit 8e78d8a58d
parent e3e86c0a41 45f7d3e9c4
20 changed files with 43 additions and 45 deletions
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
@ -57,6 +57,9 @@ interface Session :
     */
    val sessionParams: SessionParams

+    /**
+     * Useful shortcut to get access to the userId
+     */
    val myUserId: String
        get() = sessionParams.credentials.userId

--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
@ -50,16 +50,10 @@ internal class SessionManager @Inject constructor(private val matrixComponent: M
    }

    private fun getOrCreateSessionComponent(sessionParams: SessionParams): SessionComponent {
-        val userId = sessionParams.credentials.userId
-        if (sessionComponents.containsKey(userId)) {
-            return sessionComponents[userId]!!
+        return sessionComponents.getOrPut(sessionParams.credentials.userId) {
+            DaggerSessionComponent
+                    .factory()
+                    .create(matrixComponent, sessionParams)
        }
-        return DaggerSessionComponent
-                .factory()
-                .create(matrixComponent, sessionParams)
-                .also {
-                    sessionComponents[sessionParams.credentials.userId] = it
-                }
    }
-
 }
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
@ -94,11 +94,11 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
    }

    override fun requireBackgroundSync() {
-        SyncWorker.requireBackgroundSync(context, sessionParams.credentials.userId)
+        SyncWorker.requireBackgroundSync(context, myUserId)
    }

    override fun startAutomaticBackgroundSync(repeatDelay: Long) {
-        SyncWorker.automaticallyBackgroundSync(context, sessionParams.credentials.userId, 0, repeatDelay)
+        SyncWorker.automaticallyBackgroundSync(context, myUserId, 0, repeatDelay)
    }

    override fun stopAnyBackgroundSync() {
--- a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
@ -199,7 +199,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
        if (eventType == null) {
            //Just add a generic unknown event
            val simpleNotifiableEvent = SimpleNotifiableEvent(
-                    session.sessionParams.credentials.userId,
+                    session.myUserId,
                    eventId,
                    true, //It's an issue in this case, all event will bing even if expected to be silent.
                    title = getString(R.string.notification_unknown_new_event),
@ -238,7 +238,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
                }

                notifiableEvent.isPushGatewayEvent = true
-                notifiableEvent.matrixID = session.sessionParams.credentials.userId
+                notifiableEvent.matrixID = session.myUserId
                notificationDrawerManager.onNotifiableEventReceived(notifiableEvent)
                notificationDrawerManager.refreshNotificationDrawer()
            }
--- a/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt
@ -58,10 +58,10 @@ open class UserAvatarPreference : Preference {
    open fun refreshAvatar() {
        val session = mSession ?: return
        val view = mAvatarView ?: return
-        session.getUser(session.sessionParams.credentials.userId)?.let {
+        session.getUser(session.myUserId)?.let {
            avatarRenderer.render(it, view)
        } ?: run {
-            avatarRenderer.render(null, session.sessionParams.credentials.userId, null, view)
+            avatarRenderer.render(null, session.myUserId, null, view)
        }

    }
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
@ -21,8 +21,8 @@ import androidx.lifecycle.ViewModel
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.listeners.StepProgressListener
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.riotx.R
 import im.vector.riotx.core.platform.WaitingViewData
 import im.vector.riotx.core.ui.views.KeysBackupBanner
@ -57,7 +57,7 @@ class KeysBackupRestoreFromKeyViewModel @Inject constructor() : ViewModel() {
        keysBackup.restoreKeysWithRecoveryKey(keysVersionResult,
                recoveryKey,
                null,
-                session.sessionParams.credentials.userId,
+                session.myUserId,
                object : StepProgressListener {
                    override fun onStepProgress(step: StepProgressListener.Step) {
                        when (step) {
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
@ -21,8 +21,8 @@ import androidx.lifecycle.ViewModel
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.listeners.StepProgressListener
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
-import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
+import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.riotx.R
 import im.vector.riotx.core.platform.WaitingViewData
 import im.vector.riotx.core.ui.views.KeysBackupBanner
@ -58,7 +58,7 @@ class KeysBackupRestoreFromPassphraseViewModel @Inject constructor() : ViewModel
        keysBackup.restoreKeyBackupWithPassword(keysVersionResult,
                passphrase.value!!,
                null,
-                sharedViewModel.session.sessionParams.credentials.userId,
+                sharedViewModel.session.myUserId,
                object : StepProgressListener {
                    override fun onStepProgress(step: StepProgressListener.Step) {
                        when (step) {
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt
@ -52,7 +52,7 @@ class HomeDrawerFragment : VectorBaseFragment() {
            replaceChildFragment(groupListFragment, R.id.homeDrawerGroupListContainer)
        }

-        session.observeUser(session.sessionParams.credentials.userId).observeK(this) { user ->
+        session.observeUser(session.myUserId).observeK(this) { user ->
            if (user != null) {
                avatarRenderer.render(user.avatarUrl, user.userId, user.displayName, homeDrawerHeaderAvatarView)
                homeDrawerUsernameView.text = user.displayName
--- a/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewModel.kt
@ -93,7 +93,7 @@ class GroupListViewModel @AssistedInject constructor(@Assisted initialState: Gro
                .rx()
                .liveGroupSummaries()
                .map {
-                    val myUser = session.getUser(session.sessionParams.credentials.userId)
+                    val myUser = session.getUser(session.myUserId)
                    val allCommunityGroup = GroupSummary(
                            groupId = ALL_COMMUNITIES_GROUP_ID,
                            displayName = stringProvider.getString(R.string.group_all_communities),
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
@ -487,7 +487,7 @@ class RoomDetailFragment :
            timelineEventController.setTimeline(state.timeline, state.eventId)
            inviteView.visibility = View.GONE

-            val uid = session.sessionParams.credentials.userId
+            val uid = session.myUserId
            val meMember = session.getRoom(state.roomId)?.getRoomMember(uid)
            avatarRenderer.render(meMember?.avatarUrl, uid, meMember?.displayName, composerLayout.composerAvatarImageView)

@ -781,7 +781,7 @@ class RoomDetailFragment :
        if (null != text) {
 //            var vibrate = false

-            val myDisplayName = session.getUser(session.sessionParams.credentials.userId)?.displayName
+            val myDisplayName = session.getUser(session.myUserId)?.displayName
            if (TextUtils.equals(myDisplayName, text)) {
                // current user
                if (TextUtils.isEmpty(composerLayout.composerEditText.text)) {
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
@ -352,7 +352,7 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
    }

    private fun handleUndoReact(action: RoomDetailActions.UndoReaction) {
-        room.undoReaction(action.key, action.targetEventId, session.sessionParams.credentials.userId)
+        room.undoReaction(action.key, action.targetEventId, session.myUserId)
    }


@ -360,7 +360,7 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
        if (action.add) {
            room.sendReaction(action.selectedReaction, action.targetEventId)
        } else {
-            room.undoReaction(action.selectedReaction, action.targetEventId, session.sessionParams.credentials.userId)
+            room.undoReaction(action.selectedReaction, action.targetEventId, session.myUserId)
        }
    }

--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
@ -139,11 +139,11 @@ class MessageMenuViewModel @AssistedInject constructor(@Assisted initialState: M
                        this.add(SimpleAction(ACTION_REPLY, R.string.reply, R.drawable.ic_reply, eventId))
                    }

-                    if (canEdit(event, session.sessionParams.credentials.userId)) {
+                    if (canEdit(event, session.myUserId)) {
                        this.add(SimpleAction(ACTION_EDIT, R.string.edit, R.drawable.ic_edit, eventId))
                    }

-                    if (canRedact(event, session.sessionParams.credentials.userId)) {
+                    if (canRedact(event, session.myUserId)) {
                        this.add(SimpleAction(ACTION_DELETE, R.string.delete, R.drawable.ic_delete, eventId))
                    }

@ -183,7 +183,7 @@ class MessageMenuViewModel @AssistedInject constructor(@Assisted initialState: M
                }
                this.add(SimpleAction(ACTION_COPY_PERMALINK, R.string.permalink, R.drawable.ic_permalink, event.root.eventId))

-                if (session.sessionParams.credentials.userId != event.root.senderId && event.root.getClearType() == EventType.MESSAGE) {
+                if (session.myUserId != event.root.senderId && event.root.getClearType() == EventType.MESSAGE) {
                    //not sent by me
                    this.add(SimpleAction(ACTION_FLAG, R.string.report_content, R.drawable.ic_flag, event.root.eventId))
                }
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
@ -70,7 +70,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
                val bodyPreview = event.type

                return SimpleNotifiableEvent(
-                        session.sessionParams.credentials.userId,
+                        session.myUserId,
                        eventId = event.eventId!!,
                        noisy = false,//will be updated
                        timestamp = event.originServerTs ?: System.currentTimeMillis(),
@ -109,7 +109,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
                    roomId = event.root.roomId!!,
                    roomName = roomName)

-            notifiableEvent.matrixID = session.sessionParams.credentials.userId
+            notifiableEvent.matrixID = session.myUserId
            return notifiableEvent
        } else {
            if (event.root.isEncrypted() && event.root.mxDecryptionResult == null) {
@ -145,7 +145,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
                    roomName = roomName,
                    roomIsDirect = room.roomSummary()?.isDirect ?: false)

-            notifiableEvent.matrixID = session.sessionParams.credentials.userId
+            notifiableEvent.matrixID = session.myUserId
            notifiableEvent.soundName = null

            // Get the avatars URL
@ -175,7 +175,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
            val body = noticeEventFormatter.format(event, dName)
                    ?: stringProvider.getString(R.string.notification_new_invitation)
            return InviteNotifiableEvent(
-                    session.sessionParams.credentials.userId,
+                    session.myUserId,
                    eventId = event.eventId!!,
                    roomId = roomId,
                    timestamp = event.originServerTs ?: 0,
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt
@ -121,9 +121,9 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
                UUID.randomUUID().toString(),
                false,
                System.currentTimeMillis(),
-                session.getUser(session.sessionParams.credentials.userId)?.displayName
+                session.getUser(session.myUserId)?.displayName
                        ?: context?.getString(R.string.notification_sender_me),
-                session.sessionParams.credentials.userId,
+                session.myUserId,
                message,
                room.roomId,
                room.roomSummary()?.displayName ?: room.roomId,
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt
@ -181,8 +181,9 @@ class NotificationDrawerManager @Inject constructor(private val context: Context

        val session = activeSessionHolder.getSafeActiveSession() ?: return

-        val user = session.getUser(session.sessionParams.credentials.userId)
-        val myUserDisplayName = user?.displayName ?: session.sessionParams.credentials.userId
+        val user = session.getUser(session.myUserId)
+        // myUserDisplayName cannot be empty else NotificationCompat.MessagingStyle() will crash
+        val myUserDisplayName = user?.displayName?.takeIf { it.isNotBlank() } ?: session.myUserId
        val myUserAvatarUrl = session.contentUrlResolver().resolveThumbnail(user?.avatarUrl, avatarSize, avatarSize, ContentUrlResolver.ThumbnailMethod.SCALE)
        synchronized(eventList) {

@ -343,7 +344,7 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
            for (event in simpleEvents) {
                //We build a simple event
                if (firstTime || !event.hasBeenDisplayed) {
-                    NotificationUtils.buildSimpleEventNotification(context, event, null, myUserDisplayName)?.let {
+                    NotificationUtils.buildSimpleEventNotification(context, event, null, session.myUserId)?.let {
                        notifications.add(it)
                        NotificationUtils.showNotificationMessage(context, event.eventId, ROOM_EVENT_NOTIFICATION_ID, it)
                        event.hasBeenDisplayed = true //we can consider it as displayed
--- a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
@ -204,7 +204,7 @@ class BugReporter @Inject constructor(private val activeSessionHolder: ActiveSes
                var olmVersion = "undefined"

                activeSessionHolder.getSafeActiveSession()?.let { session ->
-                    userId = session.sessionParams.credentials.userId
+                    userId = session.myUserId
                    deviceId = session.sessionParams.credentials.deviceId ?: "undefined"
                    olmVersion = session.getCryptoVersion(context, true)
                }
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
@ -79,9 +79,9 @@ class VectorSettingsActivity : VectorBaseActivity(),
        var oFragment: Fragment? = null

        if (VectorPreferences.SETTINGS_NOTIFICATION_TROUBLESHOOT_PREFERENCE_KEY == pref?.key) {
-            oFragment = VectorSettingsNotificationsTroubleshootFragment.newInstance(session.sessionParams.credentials.userId)
+            oFragment = VectorSettingsNotificationsTroubleshootFragment.newInstance(session.myUserId)
        } else if (VectorPreferences.SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY == pref?.key) {
-            oFragment = VectorSettingsAdvancedNotificationPreferenceFragment.newInstance(session.sessionParams.credentials.userId)
+            oFragment = VectorSettingsAdvancedNotificationPreferenceFragment.newInstance(session.myUserId)
        } else {
            try {
                pref?.fragment?.let {
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
@ -95,7 +95,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {

        // Display name
        mDisplayNamePreference.let {
-            it.summary = session.getUser(session.sessionParams.credentials.userId)?.displayName ?: ""
+            it.summary = session.getUser(session.myUserId)?.displayName ?: ""
            it.text = it.summary.toString()
            it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
                onDisplayNameClick(newValue?.let { (it as String).trim() })
@ -148,7 +148,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {

        // user account
        findPreference(VectorPreferences.SETTINGS_LOGGED_IN_PREFERENCE_KEY)
-                .summary = session.sessionParams.credentials.userId
+                .summary = session.myUserId

        // home server
        findPreference(VectorPreferences.SETTINGS_HOME_SERVER_PREFERENCE_KEY)
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@ -367,7 +367,7 @@ class VectorSettingsSecurityPrivacyFragment : VectorSettingsBaseFragment() {
     * @param aMyDeviceInfo the device info
     */
    private fun refreshCryptographyPreference(aMyDeviceInfo: DeviceInfo?) {
-        val userId = session.sessionParams.credentials.userId
+        val userId = session.myUserId
        val deviceId = session.sessionParams.credentials.deviceId

        // device name
--- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
+++ b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
@ -35,7 +35,7 @@ class SignOutUiWorker(private val activity: FragmentActivity) {
        activeSessionHolder = context.vectorComponent().activeSessionHolder()
        val session = activeSessionHolder.getActiveSession()
        if (SignOutViewModel.doYouNeedToBeDisplayed(session)) {
-            val signOutDialog = SignOutBottomSheetDialogFragment.newInstance(session.sessionParams.credentials.userId)
+            val signOutDialog = SignOutBottomSheetDialogFragment.newInstance(session.myUserId)
            signOutDialog.onSignOut = Runnable {
                doSignOut()
            }