m.notice messages trigger push notifications (#238)

CHANGES.md

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

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

@@ -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 {

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

@@ -106,7 +106,7 @@ internal class TimelineEventDecryptor(
             Timber.v("Successfully decrypted event ${eventId}")
             eventEntity.setDecryptionResult(result)
         } 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) {
                 //Keep track of unknown sessions to automatically try to decrypt on new session
                 eventEntity.decryptionErrorCode = e.errorType.name