0.1.4

shadowalker77 · Apr 19, 2020 · bbcacf5 · bbcacf5
1 parent 2a2f8ce
commit bbcacf5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/app/src/main/java/ir/ayantech/pushnotification/MessagesFragment.kt b/app/src/main/java/ir/ayantech/pushnotification/MessagesFragment.kt
@@ -38,7 +38,7 @@ class MessagesFragment : FragmentationFragment() {
     private fun getMessagesList() {
         AyanNotification.getNotificationList(10) { success, totalCount, unSeenCount, notifications, getNextPageClosure ->
             if (success) {
-                messagesList.addAll(notifications)
+                notifications?.let { messagesList.addAll(it) }
                 if (messagesList.isEmpty()) {
                     noMessageTv.visibility = View.VISIBLE
                 } else {

diff --git a/pushsdk/build.gradle b/pushsdk/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 1
-        versionName "0.1.3"
+        versionName "0.1.4"
         consumerProguardFiles 'consumer-rules.pro'
     }
 

diff --git a/pushsdk/src/main/java/ir/ayantech/pushsdk/core/AyanNotification.kt b/pushsdk/src/main/java/ir/ayantech/pushsdk/core/AyanNotification.kt
@@ -118,7 +118,7 @@ object AyanNotification {
                     success,
                     it.TotalCount,
                     it.UnSeenCount,
-                    it.Notifications.map {
+                    it.Notifications?.map {
                         NotificationObject(
                             it.NotificationID,
                             MessageDeserializer.stringToMessage(

diff --git a/pushsdk/src/main/java/ir/ayantech/pushsdk/model/api/GetNotificationsList.kt b/pushsdk/src/main/java/ir/ayantech/pushsdk/model/api/GetNotificationsList.kt
@@ -9,7 +9,7 @@ data class GetNotificationsListInput(
 data class GetNotificationsListOutput(
     val HasMore: Boolean,
     val NextOffset: Long,
-    val Notifications: List<GetNotificationDetailOutput>,
+    val Notifications: List<GetNotificationDetailOutput>?,
     val TotalCount: Long,
     val UnSeenCount: Long
 )
diff --git a/pushsdk/src/main/java/ir/ayantech/pushsdk/networking/PushNotificationNetworking.kt b/pushsdk/src/main/java/ir/ayantech/pushsdk/networking/PushNotificationNetworking.kt
@@ -21,7 +21,7 @@ typealias NotificationObjectsCallBack = (
     success: Boolean,
     totalCount: Long,
     unSeenCount: Long,
-    notifications: List<NotificationObject<*>>,
+    notifications: List<NotificationObject<*>>?,
     getNextPageClosure: SimpleCallBack?
 ) -> Unit
 
@@ -76,7 +76,10 @@ object PushNotificationNetworking {
         ayanApi.ayanCall<Void>(
             AyanCallStatus {
                 success {
-                    PreferencesManager.saveToSharedPreferences(Constants.SERVER_NOTIFIED_MOBILE, true)
+                    PreferencesManager.saveToSharedPreferences(
+                        Constants.SERVER_NOTIFIED_MOBILE,
+                        true
+                    )
                     Log.d(
                         "AyanPush",
                         "User mobile number successfully reported to the server."
@@ -118,7 +121,9 @@ object PushNotificationNetworking {
         ayanApi.ayanCall<GetNotificationsListOutput>(
             AyanCallStatus {
                 success {
-                    it.response?.Parameters?.let { callback(true, it) }
+                    it.response?.Parameters?.let {
+                        callback(true, it)
+                    }
                 }
                 failure {
                     callback(false, null)