Skip to content

Commit 7069e76

Browse files
committed
fix: pr comments
1 parent 329b63f commit 7069e76

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

app/src/main/java/to/bitkit/appwidget/AppWidgetPreferencesStore.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ class AppWidgetPreferencesStore @Inject constructor(
8282
}
8383

8484
suspend fun cacheArticlesAndRotate(articles: List<ArticleDTO>) {
85+
if (articles.isEmpty()) return
8586
store.updateData {
8687
it.copy(
8788
cachedArticles = articles,

app/src/main/java/to/bitkit/models/widget/ArticleModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ data class ArticleModel(
2424
val publisher: String
2525
)
2626

27-
fun ArticleModel.safeBrowserUri(): Uri? {
27+
fun ArticleModel.safeBrowserUri(): Uri? = safeBrowserUri(link)
28+
29+
fun safeBrowserUri(link: String): Uri? {
2830
if (link.isEmpty()) return null
2931
val uri = runCatching { link.toUri() }.getOrNull() ?: return null
3032
val scheme = uri.scheme?.lowercase(Locale.ROOT)

app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlineCard.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import androidx.compose.ui.platform.testTag
1919
import androidx.compose.ui.text.style.TextOverflow
2020
import androidx.compose.ui.tooling.preview.Preview
2121
import androidx.compose.ui.unit.dp
22-
import androidx.core.net.toUri
22+
import to.bitkit.models.widget.safeBrowserUri
2323
import to.bitkit.ui.components.BodySSB
2424
import to.bitkit.ui.components.Title
2525
import to.bitkit.ui.screens.widgets.components.WidgetCardDimens
@@ -44,8 +44,8 @@ fun HeadlineCard(
4444
.clip(shape = MaterialTheme.shapes.medium)
4545
.background(Colors.White10)
4646
.clickableAlpha {
47-
if (link.isEmpty()) return@clickableAlpha
48-
val intent = Intent(Intent.ACTION_VIEW, link.toUri())
47+
val uri = safeBrowserUri(link) ?: return@clickableAlpha
48+
val intent = Intent(Intent.ACTION_VIEW, uri)
4949
context.startActivity(intent)
5050
}
5151
) {
@@ -106,8 +106,8 @@ fun HeadlineCardSmall(
106106
.clip(shape = MaterialTheme.shapes.medium)
107107
.background(Colors.White10)
108108
.clickableAlpha {
109-
if (link.isEmpty()) return@clickableAlpha
110-
val intent = Intent(Intent.ACTION_VIEW, link.toUri())
109+
val uri = safeBrowserUri(link) ?: return@clickableAlpha
110+
val intent = Intent(Intent.ACTION_VIEW, uri)
111111
context.startActivity(intent)
112112
}
113113
) {

0 commit comments

Comments
 (0)