diff --git a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt index 87facd860..0989bffaa 100644 --- a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt +++ b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt @@ -272,7 +272,8 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() { apiVersion, signatureVerification.userEntity.baseUrl, decryptedPushMessage.id - ), null + ), + null ) .repeatWhen { completed -> completed.zipWith(Observable.range(1, 12), { _, i -> i }) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt index 0ab861725..470ba3c8f 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt @@ -28,25 +28,25 @@ import kotlinx.android.parcel.Parcelize @JsonObject data class Mention( @JsonField(name = ["id"]) - var id : String, + var id: String, @JsonField(name = ["label"]) - var label : String, + var label: String, // type of user (guests or users or calls) @JsonField(name = ["source"]) - var source : String, + var source: String, @JsonField(name = ["status"]) - var status : String?, + var status: String?, @JsonField(name = ["statusIcon"]) - var statusIcon : String?, + var statusIcon: String?, @JsonField(name = ["statusMessage"]) - var statusMessage : String? + var statusMessage: String? ) : Parcelable { // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this("", "", "", "", "", "") -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt index b5a4fbe13..34e3ea19c 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt @@ -12,7 +12,7 @@ data class ClearAt( var type: String, @JsonField(name = ["time"]) var time: String - ) : Parcelable{ +) : Parcelable { // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this("type", "time") } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt index 3f11936de..4e8eda9b4 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt @@ -1,11 +1,9 @@ package com.nextcloud.talk.models.json.status - - enum class StatusType(val string: String) { ONLINE("online"), OFFLINE("offline"), DND("dnd"), AWAY("away"), INVISIBLE("invisible"); -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt index 89c2bb08e..170d0cb9a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt @@ -17,7 +17,7 @@ data class PredefinedStatus( var message: String, @JsonField(name = ["clearAt"]) var clearAt: ClearAt? - ) : Parcelable { +) : Parcelable { // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this("id", "icon", "message", null) } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt index 53164cd65..0a6e6ecbd 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt @@ -14,4 +14,4 @@ data class PredefinedStatusOCS( ) : GenericOCS(), Parcelable { // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this(null) -} \ No newline at end of file +}