Skip to content

Android 13 fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kerrely wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Android 13 fixes #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f483394
Fixed typo when decoding SMS from JSON
Feb 13, 2023
1db3d4c
SMS ID made nullable
Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions lib/sms.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -69,8 +68,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'],
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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) {
Expand Down