Merge branch 'develop' into feature/dagger

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/PushersService.kt

@@ -61,4 +61,6 @@ interface PushersService {
     }
 
     fun livePushers(): LiveData<List<Pusher>>
+
+    fun pushers() : List<Pusher>
 }

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

@@ -191,5 +191,4 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
         }
     }
 
-
 }

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

@@ -37,12 +37,15 @@ internal class BingRuleWatcher @Inject constructor(monarchy: Monarchy,
     override val query = Monarchy.Query<EventEntity> {
 
         EventEntity.types(it, listOf(
-                EventType.REDACTION, EventType.MESSAGE, EventType.REDACTION, EventType.ENCRYPTED)
+                EventType.MESSAGE,
+                EventType.REDACTION,
+                EventType.ENCRYPTED)
         )
 
     }
 
     override fun processChanges(inserted: List<EventEntity>, updated: List<EventEntity>, deleted: List<EventEntity>) {
+        // TODO Use const for "global"
         val rules = defaultPushRuleService.getPushRules("global")
         inserted.map { it.asDomain() }
                 .filter { it.senderId != sessionParams.credentials.userId }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPusherService.kt

@@ -112,4 +112,8 @@ internal class DefaultPusherService @Inject constructor(
                 { it.asDomain() }
         )
     }
+
+    override fun pushers(): List<Pusher> {
+        return monarchy.fetchAllCopiedSync { PusherEntity.where(it, sessionParam.credentials.userId) }.map { it.asDomain() }
+    }
 }