From f48339483f79e9db539605db9395908dc86e5dd0 Mon Sep 17 00:00:00 2001
From: Jan Kollert <jan.kollert@digital.cz>
Date: Mon, 13 Feb 2023 12:44:22 +0100
Subject: [PATCH 1/2] Fixed typo when decoding SMS from JSON

---
 lib/sms.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/sms.dart b/lib/sms.dart
index 90aefb4..69baca9 100644
--- a/lib/sms.dart
+++ b/lib/sms.dart
@@ -69,8 +69,8 @@ class SmsMessage implements Comparable<SmsMessage> {
   /// }
   /// ```
   factory SmsMessage.fromJson(Map data) {
-    final date = data['date'];
-    final dateSent = date['date_sent'];
+    final date = data['date'] as int?;
+    final dateSent = data['date_sent'] as int?;
     return SmsMessage(
       address: data['address'],
       body: data['body'],

From 1db3d4c94efbd7dde557cca5394afaad3398a6be Mon Sep 17 00:00:00 2001
From: Jan Kollert <jan.kollert@digital.cz>
Date: Mon, 13 Feb 2023 13:06:02 +0100
Subject: [PATCH 2/2] SMS ID made nullable

---
 lib/sms.dart | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/sms.dart b/lib/sms.dart
index 69baca9..1c9ab0a 100644
--- a/lib/sms.dart
+++ b/lib/sms.dart
@@ -28,7 +28,7 @@ enum SmsMessageKind {
 ///
 /// Used to send message or used to read message.
 class SmsMessage implements Comparable<SmsMessage> {
-  int _id;
+  int? _id;
   int? _threadId;
   String _address;
   String _body;
@@ -37,13 +37,12 @@ class SmsMessage implements Comparable<SmsMessage> {
   DateTime? _dateSent;
   SmsMessageKind? _kind;
   SmsMessageState _state = SmsMessageState.None;
-  StreamController<SmsMessageState> _stateStreamController =
-      new StreamController<SmsMessageState>();
+  StreamController<SmsMessageState> _stateStreamController = new StreamController<SmsMessageState>();
 
   SmsMessage({
     required String address,
     required String body,
-    required int id,
+    int? id,
     int? threadId,
     bool? read,
     DateTime? date,
@@ -149,7 +148,7 @@ class SmsMessage implements Comparable<SmsMessage> {
 
   @override
   int compareTo(SmsMessage other) {
-    return other._id - this._id;
+    return (other._id ?? 0) - (this._id ?? 0);
   }
 }
 
@@ -286,8 +285,7 @@ class SmsSender {
   final EventChannel _stateChannel;
   Map<int, SmsMessage> _sentMessages;
   int _sentId = 0;
-  final StreamController<SmsMessage> _deliveredStreamController =
-      new StreamController<SmsMessage>();
+  final StreamController<SmsMessage> _deliveredStreamController = new StreamController<SmsMessage>();
 
   factory SmsSender() {
     if (_instance == null) {