Merge pull request #43

* fix: Fixed few crashes and change date format to 24 for api

app/build.gradle.kts

@@ -13,7 +13,7 @@ android {
         applicationId = "com.a3.yearlyprogess"
         minSdk = 30
         targetSdk = 35
-        versionCode = 76
+        versionCode = 77
         val localVersionCode = versionCode
         versionName = "2.${localVersionCode!! - 64}-beta"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/a3/yearlyprogess/data/SunriseSunsetApi.kt

@@ -11,6 +11,7 @@ interface SunriseSunsetApi {
         @Query("lat") lat: Double,
         @Query("lng") lon: Double,
         @Query("date_start") startDate: String,
-        @Query("date_end") endDate: String
+        @Query("date_end") endDate: String,
+        @Query("time_format") timeFormat: String = "24"
     ): Response<SunriseSunsetResponse>
 }

app/src/main/java/com/a3/yearlyprogess/data/models/Result.kt

@@ -2,6 +2,7 @@ package com.a3.yearlyprogess.data.models
 
 import android.icu.text.SimpleDateFormat
 import android.icu.util.TimeZone
+import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
@@ -58,14 +59,40 @@ data class Result(
     }
 
     private fun convertToDateTime(time: String): Date {
-        val dateTime = "$date $time"
-        val formatter = SimpleDateFormat(
-            "yyyy-MM-dd hh:mm:ss a", Locale.getDefault()
-        )
-        val timeZone = TimeZone.getTimeZone(timezone) // Adjust as needed
-        formatter.timeZone = timeZone
-
-        val newDate = formatter.parse(dateTime)
-        return newDate
+        try {
+            val dateTime = "$date $time"
+            val formatter = SimpleDateFormat(
+                "yyyy-MM-dd hh:mm:ss", Locale.getDefault()
+            )
+            val timeZone = TimeZone.getTimeZone(timezone) // Adjust as needed
+            formatter.timeZone = timeZone
+
+            val newDate = formatter.parse(dateTime)
+            return newDate
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+        }
+
+        val cal = Calendar.getInstance()
+        cal.timeInMillis = System.currentTimeMillis()
+
+        val year = date.split("-")[0].toInt()
+        val month = date.split("-")[1].toInt()
+        val day = date.split("-")[2].toInt()
+
+        cal.set(Calendar.YEAR, year)
+        cal.set(Calendar.MONTH, month - 1)
+        cal.set(Calendar.DAY_OF_MONTH, day)
+
+
+        val onlyTime = time.split(" ")[0]
+        val hour = onlyTime.split(":")[0].toInt()
+        val minute = onlyTime.split(":")[1].toInt()
+        val second = onlyTime.split(":")[2].toInt()
+        cal.set(Calendar.HOUR_OF_DAY, hour)
+        cal.set(Calendar.MINUTE, minute)
+        cal.set(Calendar.SECOND, second)
+
+        return cal.time
     }
 }

app/src/main/java/com/a3/yearlyprogess/widgets/manager/updateManager/services/WidgetUpdateBroadcastReceiver.kt

@@ -108,6 +108,9 @@ class WidgetUpdateBroadcastReceiver : BroadcastReceiver() {
                             if (response.isSuccessful && result != null) {
                                 storeSunriseSunset(context, result)
                             }
+                        }
+                        catch (ex: Exception) {
+                            Log.d("WUBR", ex.message.toString())
                         } finally {
                             cancel()
                         }