From ca890e1ef473eaddcd251c0504dfc00b308d22e6 Mon Sep 17 00:00:00 2001
From: ganfra <francois.ganard@gmail.com>
Date: Wed, 20 Feb 2019 18:09:07 +0100
Subject: [PATCH] Room tag: let the tag order be anything to avoid breaking at
 the moment.

---
 .../android/api/session/room/model/tag/RoomTagContent.kt   | 2 +-
 .../matrix/android/internal/session/sync/RoomTagHandler.kt | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTagContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTagContent.kt
index a5f7650b..388f494d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTagContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTagContent.kt
@@ -21,5 +21,5 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class RoomTagContent(
-        @Json(name = "tags") val tags: Map<String, Map<String, Double>> = emptyMap()
+        @Json(name = "tags") val tags: Map<String, Map<String, Any>> = emptyMap()
 )
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTagHandler.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTagHandler.kt
index c3722ea6..90915b42 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTagHandler.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomTagHandler.kt
@@ -32,15 +32,16 @@ internal class RoomTagHandler {
         val tags = ArrayList<RoomTagEntity>()
         for (tagName in content.tags.keys) {
             val params = content.tags[tagName]
-            val tag = if (params != null) {
-                RoomTagEntity(tagName, params["order"])
+            val order = params?.get("order")
+            val tag = if (order is Double) {
+                RoomTagEntity(tagName, order)
             } else {
                 RoomTagEntity(tagName, null)
             }
             tags.add(tag)
         }
         val roomSummaryEntity = RoomSummaryEntity.where(realm, roomId).findFirst()
-                                ?: RoomSummaryEntity(roomId)
+                ?: RoomSummaryEntity(roomId)
 
         roomSummaryEntity.tags.clear()
         roomSummaryEntity.tags.addAll(tags)