filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/fix_filtering_redacted

This commit is contained in:
ganfra 2020-09-21 20:25:49 +02:00 committed by GitHub
parent a29ca2ae09 22e03b14d1
commit 4d558c5f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -12,6 +12,7 @@ Bugfix 🐛:
- User Verification in DM not working - User Verification in DM not working
- Manual import of Megolm keys does back up the imported keys - Manual import of Megolm keys does back up the imported keys
- Auto scrolling to the latest message when sending (#2094) - Auto scrolling to the latest message when sending (#2094)
- Fix incorrect permission check when creating widgets (#2137)
Translations 🗣: Translations 🗣:
- -

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
View File

@ -202,6 +202,6 @@ internal class WidgetManager @Inject constructor(private val integrationManager:
stateKey = QueryStringValue.NoCondition stateKey = QueryStringValue.NoCondition
) )
val powerLevelsContent = powerLevelsEvent?.content?.toModel<PowerLevelsContent>() ?: return false val powerLevelsContent = powerLevelsEvent?.content?.toModel<PowerLevelsContent>() ?: return false
return PowerLevelsHelper(powerLevelsContent).isUserAllowedToSend(userId, true, null) return PowerLevelsHelper(powerLevelsContent).isUserAllowedToSend(userId, true, EventType.STATE_ROOM_WIDGET_LEGACY)
} }
} }