-
Notifications
You must be signed in to change notification settings - Fork 271
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[i116] Extend PushMessage to access extra data (#4945)
* [i116] Extend PushMessage to access extra data * [i116] add CHANGELOG
- Loading branch information
Showing
8 changed files
with
160 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
...rc/main/java/io/getstream/chat/android/client/notifications/parser/StreamPayloadParser.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Copyright (c) 2014-2023 Stream.io Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Stream License; | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://github.com/GetStream/stream-chat-android/blob/main/LICENSE | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.getstream.chat.android.client.notifications.parser | ||
|
|
||
| import com.squareup.moshi.JsonAdapter | ||
| import com.squareup.moshi.Moshi | ||
| import com.squareup.moshi.Types | ||
| import io.getstream.chat.android.core.internal.InternalStreamChatApi | ||
| import io.getstream.log.StreamLog | ||
|
|
||
| /** | ||
| * Helper class for parsing the payload of a push message. | ||
| */ | ||
| @InternalStreamChatApi | ||
| public object StreamPayloadParser { | ||
|
|
||
| private const val TAG = "StreamPayloadParser" | ||
|
|
||
| private val mapAdapter: JsonAdapter<MutableMap<String, Any?>> by lazy { | ||
| Moshi.Builder() | ||
| .build() | ||
| .adapter(Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java)) | ||
| } | ||
|
|
||
| /** | ||
| * Parses the [json] string into a [Map] of [String] to [Any]. | ||
| */ | ||
| public fun parse(json: String?): Map<String, Any?> { | ||
| return try { | ||
| json?.takeIf { it.isNotBlank() }?.let { mapAdapter.fromJson(it) } ?: emptyMap() | ||
| } catch (e: Throwable) { | ||
| StreamLog.e(TAG, e) { "[parse] failed: $json" } | ||
| emptyMap() | ||
| } | ||
| } | ||
| } |
77 changes: 77 additions & 0 deletions
77
...est/java/io/getstream/chat/android/client/notifications/parser/StreamPayloadParserTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright (c) 2014-2023 Stream.io Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Stream License; | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://github.com/GetStream/stream-chat-android/blob/main/LICENSE | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.getstream.chat.android.client.notifications.parser | ||
|
|
||
| import org.amshove.kluent.shouldBeEqualTo | ||
| import org.junit.Test | ||
|
|
||
| public class StreamPayloadParserTest { | ||
|
|
||
| @Test | ||
| public fun parseNullContent() { | ||
| val parsedMap = StreamPayloadParser.parse(null) | ||
| parsedMap shouldBeEqualTo emptyMap() | ||
| } | ||
|
|
||
| @Test | ||
| public fun parseEmptyContent() { | ||
| val jsonString = "" | ||
|
|
||
| val parsedMap = StreamPayloadParser.parse(jsonString) | ||
| parsedMap shouldBeEqualTo emptyMap() | ||
| } | ||
|
|
||
| @Test | ||
| public fun parseExpectedContent() { | ||
| val jsonString = """{ | ||
| "file_type": "file", | ||
| "message": "Retro", | ||
| "sender_name": "Dmitrii Bychkov", | ||
| "unread_message_count": "8", | ||
| "nested_object": { | ||
| "key1": "value1", | ||
| "key2": "value2", | ||
| "key3": null, | ||
| "key4": "null" | ||
| }, | ||
| "nested_array": [ | ||
| "item1", | ||
| "item2", | ||
| "item3" | ||
| ] | ||
| }""" | ||
|
|
||
| val parsedMap = StreamPayloadParser.parse(jsonString) | ||
| parsedMap shouldBeEqualTo mapOf( | ||
| "file_type" to "file", | ||
| "message" to "Retro", | ||
| "sender_name" to "Dmitrii Bychkov", | ||
| "unread_message_count" to "8", | ||
| "nested_object" to mapOf( | ||
| "key1" to "value1", | ||
| "key2" to "value2", | ||
| "key3" to null, | ||
| "key4" to "null", | ||
| ), | ||
| "nested_array" to listOf( | ||
| "item1", | ||
| "item2", | ||
| "item3", | ||
| ), | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters