Change Date to Java Date

Author: heart

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

@@ -1,6 +1,7 @@
 package ai.pams.android.kotlin.models.notification
 
 import ai.pams.android.kotlin.utils.DateUtils
+import ai.pams.android.kotlin.utils.PAMUtils
 import android.content.Context
 import org.json.JSONException
 import org.json.JSONObject
@@ -47,8 +48,10 @@ class NotificationList(
                         }
                     }
 
+                    val date = PAMUtils.convertToJavaDate(DateUtils.localDateTimeFromString(createdDate))
+
                     val item = NotificationItem(
-                        date = DateUtils.localDateTimeFromString(createdDate),
+                        date = date,
                         deliverId = jsonItem.optString("deliver_id"),
                         description = jsonItem.optString("description"),
                         flex = jsonItem.optString("flex"),

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

@@ -9,12 +9,12 @@ import android.content.Context
 import android.os.Parcel
 import android.os.Parcelable
 import org.json.JSONObject
-import org.threeten.bp.LocalDateTime
-
+import java.text.SimpleDateFormat
+import java.util.*
 
 
 data class NotificationItem(
-    var date: LocalDateTime? = null,
+    var date: Date? = null,
     val deliverId: String? = null,
     val description: String? = null,
     val flex: String? = null,
@@ -29,7 +29,7 @@ data class NotificationItem(
     var bannerUrl: String? = null
 
     @Deprecated("createdDate is deprecated use date instead.", ReplaceWith("date"))
-    val createdDate: LocalDateTime?
+    val createdDate: Date?
         get() = date
 
     fun parseFlex(context: Context) {
@@ -87,7 +87,8 @@ data class NotificationItem(
         if( date != null ){
             var dateStr = ""
             date?.let{
-                dateStr = DateUtils.localDateToServerFormat(it)
+                val dateFormat = SimpleDateFormat("yyyy-mm-dd hh:mm:ss")
+                dateStr = dateFormat.format(it)
             }
             parcel.writeString(dateStr)
         }else{
@@ -141,9 +142,9 @@ data class NotificationItem(
             }
             return m.toMap()
         }
-        fun convertStringToDate(str: String?): LocalDateTime?{
-            str?.let{
-                return@convertStringToDate DateUtils.localDateTimeFromString(str)
+        fun convertStringToDate(str: String?): Date?{
+            str?.let {
+                return@convertStringToDate SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse(it)
             }
             return null
         }

pam-android-kotlin/src/main/java/ai/pams/android/kotlin/utils/PAMUtils.kt

@@ -1,19 +1,27 @@
 package ai.pams.android.kotlin.utils
 
 import ai.pams.android.kotlin.models.notification.NotificationItem
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import com.google.firebase.messaging.RemoteMessage
 import org.json.JSONObject
 import org.threeten.bp.LocalDateTime
+import java.util.*
 
 class PAMUtils {
     companion object{
         fun isPamNotification(message: RemoteMessage): Boolean{
             return message.data.containsKey("pam")
         }
 
+         fun convertToJavaDate(ld: LocalDateTime): Date {
+            val cal: Calendar = Calendar.getInstance()
+            cal.set(Calendar.YEAR, ld.year)
+            cal.set(Calendar.MONTH,ld.month.value-1)
+            cal.set(Calendar.DAY_OF_MONTH, ld.dayOfMonth)
+            return cal.time
+        }
+
         fun convertRemoteMessageToPam(remoteMessage: RemoteMessage, context: Context): NotificationItem?{
             //remoteMessage.notification
             return when(remoteMessage.data.containsKey("pam")){
@@ -33,8 +41,10 @@ class PAMUtils {
                         else-> DateUtils.localDateTimeFromString(pamObj.getString("created_date"))
                     }
 
+                    val date = convertToJavaDate(createdDate)
+
                     NotificationItem(
-                        createdDate,
+                        date,
                         null,
                         remoteMessage.notification?.body,
                         pamObj.getString("flex"),
@@ -60,7 +70,7 @@ class PAMUtils {
                     val title = intent.extras?.getString("title")
                     val message = intent.extras?.getString("message")
 
-                    val pam = intent.extras?.getString("pam")
+                    val pam = intent.extras?.getString("pam") ?: "{}"
                     val pamObj = JSONObject(pam)
 
                     val payload = mutableMapOf<String, Any>()
@@ -76,7 +86,7 @@ class PAMUtils {
                     }
 
                     NotificationItem(
-                        createdDate,
+                        convertToJavaDate(createdDate),
                         null,
                         message,
                         pamObj.getString("flex"),