jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m.notice messages trigger push notifications (#238)

This commit is contained in:
Benoit Marty 2019-09-20 16:31:13 +02:00
parent d3d4deb884
commit faa8e6bbb2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -17,6 +17,7 @@ Bugfix:
- "No connection" banner was displayed by mistake - "No connection" banner was displayed by mistake
- Leaving community (from another client) has no effect on RiotX (#497) - Leaving community (from another client) has no effect on RiotX (#497)
- Push rules was not retrieved after a clear cache - Push rules was not retrieved after a clear cache
- m.notice messages trigger push notifications (#238)
Translations: Translations:
- -

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt
View File

@ -87,7 +87,8 @@ internal class DefaultPushRuleService @Inject constructor(private val getPushRul
} }
} }
return contentRules + overrideRules + roomRules + senderRules + underrideRules // Ref. for the order: https://matrix.org/docs/spec/client_server/latest#push-rules
return overrideRules + contentRules + roomRules + senderRules + underrideRules
} }
override fun updatePushRuleEnableStatus(kind: RuleKind, pushRule: PushRule, enabled: Boolean, callback: MatrixCallback<Unit>): Cancelable { override fun updatePushRuleEnableStatus(kind: RuleKind, pushRule: PushRule, enabled: Boolean, callback: MatrixCallback<Unit>): Cancelable {

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineEventDecryptor.kt
View File

@ -106,7 +106,7 @@ internal class TimelineEventDecryptor(
Timber.v("Successfully decrypted event ${eventId}") Timber.v("Successfully decrypted event ${eventId}")
eventEntity.setDecryptionResult(result) eventEntity.setDecryptionResult(result)
} catch (e: MXCryptoError) { } catch (e: MXCryptoError) {
Timber.v("Failed to decrypte event ${eventId} ${e}") Timber.v("Failed to decrypt event ${eventId} ${e}")
if (e is MXCryptoError.Base && e.errorType == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID) { if (e is MXCryptoError.Base && e.errorType == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID) {
//Keep track of unknown sessions to automatically try to decrypt on new session //Keep track of unknown sessions to automatically try to decrypt on new session
eventEntity.decryptionErrorCode = e.errorType.name eventEntity.decryptionErrorCode = e.errorType.name