diff --git a/CHANGELOG.md b/CHANGELOG.md index 4662f82f..645e4d05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- Fixed inability to view messages when there is no SIM card ([#461]) + ## [1.2.1] - 2025-06-17 ### Changed @@ -171,3 +175,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#279]: https://github.com/FossifyOrg/Messages/issues/279 [#287]: https://github.com/FossifyOrg/Messages/issues/287 [#294]: https://github.com/FossifyOrg/Messages/issues/294 +[#461]: https://github.com/FossifyOrg/Messages/issues/461 diff --git a/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt index 0ce7dbd1..b2f0d68e 100644 --- a/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt @@ -30,6 +30,7 @@ import me.leolin.shortcutbadger.ShortcutBadger import org.fossify.commons.extensions.areDigitsOnly import org.fossify.commons.extensions.getBlockedNumbers import org.fossify.commons.extensions.getIntValue +import org.fossify.commons.extensions.getIntValueOr import org.fossify.commons.extensions.getLongValue import org.fossify.commons.extensions.getMyContactsCursor import org.fossify.commons.extensions.getStringValue @@ -161,7 +162,11 @@ fun Context.getMessages( val date = (cursor.getLongValue(Sms.DATE) / 1000).toInt() val read = cursor.getIntValue(Sms.READ) == 1 val thread = cursor.getLongValue(Sms.THREAD_ID) - val subscriptionId = cursor.getIntValue(Sms.SUBSCRIPTION_ID) + val subscriptionId = cursor.getIntValueOr( + key = Sms.SUBSCRIPTION_ID, + defaultValue = SubscriptionManager.INVALID_SUBSCRIPTION_ID + ) + val status = cursor.getIntValue(Sms.STATUS) val participants = senderNumber.split(ADDRESS_SEPARATOR).map { number -> val phoneNumber = PhoneNumber(number, 0, "", number)