Merge release/2024.12.16T00.23.56 into master

plaidev · Dec 16, 2024 · 662c364 · 662c364
2 parents c3af403 + aa1df01
commit 662c364
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,13 @@
 | visualtracking | ビジュアルトラッキング機能を提供します。| 2.9.0 |
 | Karte Gradle Plugin | ビジュアルトラッキング機能に必要なプラグインです。| 2.5.1 |
 
+# Releases - 2024.12.16
+
+### Core 2.26.0
+
+** 🔨FIXED **
+- イベント送信時にまれにクラッシュする不具合を修正しました。
+
 # Releases - 2024.12.13
 
 ### Core 2.25.1

diff --git a/core/src/main/java/io/karte/android/tracking/queue/Dispatcher.kt b/core/src/main/java/io/karte/android/tracking/queue/Dispatcher.kt
@@ -221,18 +221,18 @@ internal class Dispatcher {
 
             when (eventName) {
                 BaseEventName.View.value -> {
-                    val viewName = it.event.values.getString("view_name")
-                    val title = it.event.values.getString("title")
+                    val viewName = it.event.values.optString("view_name", "")
+                    val title = it.event.values.optString("title", "")
                     Logger.i(LOG_TAG, "request event request_id=$requestId event_record_id=$eventRecordId visitor_id=$visitorId view_name=$viewName title=$title")
                 }
                 MessageEventName.MessageOpen.value,
                 MessageEventName.MessageSuppressed.value,
                 MessageEventName.MessageReady.value,
                 MessageEventName.MessageClick.value,
                 MessageEventName.MessageClose.value -> {
-                    val message = it.event.values.getJSONObject("message")
-                    val campaignId = message.getString("campaign_id")
-                    val shortenId = message.getString("shorten_id")
+                    val message = it.event.values.optJSONObject("message")
+                    val campaignId = message?.optString("campaign_id", "") ?: ""
+                    val shortenId = message?.optString("shorten_id", "") ?: ""
                     Logger.i(LOG_TAG, "request event request_id=$requestId event_record_id=$eventRecordId visitor_id=$visitorId campaign_id=$campaignId shorten_id=$shortenId")
                 }
                 else -> {}

diff --git a/core/version b/core/version
@@ -1 +1 @@
-2.25.1
+2.26.0