nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

replace null checks with Elvis

Browse Source
This commit is contained in:
davotoula
2026-03-06 22:09:19 +01:00
parent 4e614a3179
commit d7d9352a90
5 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
+2 -5
View File
@@ -65,14 +65,11 @@ class LightningAddressResolver {
okHttpClient: (String) -> OkHttpClient, okHttpClient: (String) -> OkHttpClient,
context: Context, context: Context,
): String { ): String {
val url = assembleUrl(lnAddress) val url =
assembleUrl(lnAddress) ?: throw LightningAddressError(
if (url == null) {
throw LightningAddressError(
stringRes(context, R.string.error_unable_to_fetch_invoice), stringRes(context, R.string.error_unable_to_fetch_invoice),
stringRes(context, R.string.could_not_assemble_lnurl_from_lightning_address_check_the_user_s_setup, lnAddress), stringRes(context, R.string.could_not_assemble_lnurl_from_lightning_address_check_the_user_s_setup, lnAddress),
) )
}
val client = okHttpClient(url) val client = okHttpClient(url)
amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt
+1 -2
View File
@@ -48,8 +48,7 @@ class OkHttpWebSocket(
override fun needsReconnect(): Boolean { override fun needsReconnect(): Boolean {
if (socket == null) return true if (socket == null) return true
val myUsingOkHttp = usingOkHttp val myUsingOkHttp = usingOkHttp ?: return true
if (myUsingOkHttp == null) return true
val currentOkHttp = httpClient(url) val currentOkHttp = httpClient(url)
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt
+1 -2
View File
@@ -117,8 +117,7 @@ open class DiscoverLiveFeedFilter(
fun convertStatusToOrder(event: LiveActivitiesEvent?): Int { fun convertStatusToOrder(event: LiveActivitiesEvent?): Int {
if (event == null) return 0 if (event == null) return 0
val url = event.streaming() val url = event.streaming() ?: return 0
if (url == null) return 0
return when (event.status()) { return when (event.status()) {
StatusTag.STATUS.LIVE -> { StatusTag.STATUS.LIVE -> {
if (OnlineChecker.isCachedAndOffline(url)) { if (OnlineChecker.isCachedAndOffline(url)) {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeLiveFilter.kt
+2 -4
View File
@@ -160,10 +160,8 @@ class HomeLiveFilter(
val noteEvent = note.event val noteEvent = note.event
if (noteEvent is LiveActivitiesChatMessageEvent) { if (noteEvent is LiveActivitiesChatMessageEvent) {
val stream = noteEvent.activityAddress() val stream = noteEvent.activityAddress() ?: return false
if (stream == null) return false val streamChannel = LocalCache.getLiveActivityChannelIfExists(stream) ?: return false
val streamChannel = LocalCache.getLiveActivityChannelIfExists(stream)
if (streamChannel == null) return false
if (streamChannel.info?.status() != StatusTag.STATUS.LIVE) return false if (streamChannel.info?.status() != StatusTag.STATUS.LIVE) return false
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/bookmarks/dal/UserProfileBookmarksFeedFilter.kt
+1 -3
View File
@@ -37,9 +37,7 @@ class UserProfileBookmarksFeedFilter(
override fun feed(): List<Note> { override fun feed(): List<Note> {
val note = LocalCache.getOrCreateAddressableNote(BookmarkListEvent.createBookmarkAddress(user.pubkeyHex)) val note = LocalCache.getOrCreateAddressableNote(BookmarkListEvent.createBookmarkAddress(user.pubkeyHex))
val noteEvent = note.event as? BookmarkListEvent val noteEvent = note.event as? BookmarkListEvent ?: return emptyList()
if (noteEvent == null) return emptyList()
val notes = val notes =
noteEvent.publicBookmarks().mapNotNull { noteEvent.publicBookmarks().mapNotNull {