Merge branch 'release/1.4.15'

Author: heart

pam-android-kotlin/src/main/java/ai/pams/android/kotlin/models/notification/NotificationIist.kt

@@ -2,6 +2,7 @@ package ai.pams.android.kotlin.models.notification
 
 import ai.pams.android.kotlin.utils.DateUtils
 import android.content.Context
+import org.json.JSONException
 import org.json.JSONObject
 
 class NotificationList(
@@ -19,7 +20,14 @@ class NotificationList(
             val noti = NotificationList();
             val list = mutableListOf<NotificationItem>()
 
-            val json = JSONObject(jsonString)
+            var json:JSONObject?
+            try {
+                json = JSONObject(jsonString)
+            }catch(e: JSONException){
+                noti.items = listOf()
+                return noti
+            }
+
             val itemsArray = json.optJSONArray("items")
             val count = itemsArray?.length() ?: 0
             for(i in 0 until count){
@@ -34,7 +42,7 @@ class NotificationList(
                     val iterator = jsonPayload?.keys()
                     while(iterator?.hasNext() == true){
                         val key = iterator.next()
-                        jsonPayload?.get(key)?.let{ data ->
+                        jsonPayload?.opt(key)?.let{ data->
                             payload[key] = data
                         }
                     }

pam-android-kotlin/src/test/java/ai/pams/android/kotlin/ExampleUnitTest.kt

@@ -1,7 +1,11 @@
 package ai.pams.android.kotlin
 
+import ai.pams.android.kotlin.models.notification.NotificationList
 import ai.pams.android.kotlin.utils.DateUtils
+import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.*
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -13,10 +17,22 @@ import org.robolectric.RobolectricTestRunner
  */
 @RunWith(RobolectricTestRunner::class)
 class ExampleUnitTest {
+    lateinit var instrumentationContext: Context
+
+    @Before
+    fun setup() {
+        instrumentationContext = InstrumentationRegistry.getInstrumentation().context
+    }
+
     @Test
     fun testParseDate() {
         val str = "2022-06-29 03:53:51"
         val date = DateUtils.localDateTimeFromString(str)
         assertEquals(date.hour, 10)
     }
+
+    @Test
+    fun testNotificationJSONError(){
+        NotificationList.parse("<some html>", instrumentationContext)
+    }
 }