Avoid adding feed if it's not a valid rss feed

androidApp/src/main/kotlin/com/prof18/feedflow/addfeed/AddFeedScreen.android.kt

@@ -36,6 +36,7 @@ fun AddFeedScreen(
 
  val context = LocalContext.current
  val isAddDone by viewModel.isAddDoneState.collectAsStateWithLifecycle()
+ val isInvalidUrl by viewModel.isInvalidRssFeed.collectAsStateWithLifecycle()
 
  if (isAddDone) {
  feedName = ""
@@ -48,6 +49,7 @@ fun AddFeedScreen(
  AddFeedScreenContent(
  feedName = feedName,
  feedUrl = feedUrl,
+ isInvalidUrl = isInvalidUrl,
  onFeedNameUpdated = { name ->
  feedName = name
  viewModel.updateFeedNameTextFieldValue(name)
@@ -68,6 +70,7 @@ fun AddFeedScreen(
 private fun AddFeedScreenContent(
  feedName: String,
  feedUrl: String,
+ isInvalidUrl: Boolean,
  onFeedNameUpdated: (String) -> Unit,
  onFeedUrlUpdated: (String) -> Unit,
  addFeed: () -> Unit,
@@ -99,6 +102,7 @@ private fun AddFeedScreenContent(
  feedName = feedName,
  onFeedNameUpdated = onFeedNameUpdated,
  feedUrl = feedUrl,
+ isInvalidUrl = isInvalidUrl,
  onFeedUrlUpdated = onFeedUrlUpdated,
  addFeed = addFeed,
  )
@@ -115,6 +119,23 @@ private fun AddScreenContentPreview() {
  onFeedNameUpdated = {},
  onFeedUrlUpdated = {},
  addFeed = { },
+ isInvalidUrl = false,
+ navigateBack = {},
+ )
+ }
+}
+
+@FeedFlowPreview
+@Composable
+private fun AddScreenContentInvalidUrlPreview() {
+ FeedFlowTheme {
+ AddFeedScreenContent(
+ feedName = "My Feed",
+ feedUrl = "https://www.ablog.com/feed",
+ isInvalidUrl = true,
+ onFeedNameUpdated = {},
+ onFeedUrlUpdated = {},
+ addFeed = { },
  navigateBack = {},
  )
  }

androidApp/src/main/kotlin/com/prof18/feedflow/home/HomeScreen.android.kt

@@ -60,7 +60,6 @@ import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
 
-@OptIn(ExperimentalMaterialApi::class)
 @Suppress("LongMethod")
 @Composable
 internal fun HomeScreen(

desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/about/AboutContent.kt

@@ -12,7 +12,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollbarAdapter
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider

desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/addfeed/AddFeedScreen.desktop.kt

@@ -1,7 +1,6 @@
 package com.prof18.feedflow.addfeed
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -25,6 +24,7 @@ fun AddFeedScreen(
  val viewModel = desktopViewModel { DI.koin.get<AddFeedViewModel>() }
 
  val isAddDone by viewModel.isAddDoneState.collectAsState()
+ val isInvalidUrl by viewModel.isInvalidRssFeed.collectAsState()
 
  if (isAddDone) {
  feedName = ""
@@ -35,6 +35,7 @@ fun AddFeedScreen(
  AddFeedScreenContent(
  feedName = feedName,
  feedUrl = feedUrl,
+ isInvalidUrl = isInvalidUrl,
  onFeedNameUpdated = { name ->
  feedName = name
  viewModel.updateFeedNameTextFieldValue(name)
@@ -50,10 +51,10 @@ fun AddFeedScreen(
 }
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 private fun AddFeedScreenContent(
  feedName: String,
  feedUrl: String,
+ isInvalidUrl: Boolean,
  onFeedNameUpdated: (String) -> Unit,
  onFeedUrlUpdated: (String) -> Unit,
  addFeed: () -> Unit,
@@ -62,6 +63,7 @@ private fun AddFeedScreenContent(
  AddFeedsContent(
  paddingValues = paddingValues,
  feedName = feedName,
+ isInvalidUrl = isInvalidUrl,
  onFeedNameUpdated = onFeedNameUpdated,
  feedUrl = feedUrl,
  onFeedUrlUpdated = onFeedUrlUpdated,
@@ -77,6 +79,7 @@ private fun AddScreenContentPreview() {
  AddFeedScreenContent(
  feedName = "My Feed",
  feedUrl = "https://www.ablog.com/feed",
+ isInvalidUrl = false,
  onFeedNameUpdated = {},
  onFeedUrlUpdated = {},
  addFeed = { },
@@ -93,6 +96,22 @@ private fun AddScreenContentDarkPreview() {
  AddFeedScreenContent(
  feedName = "My Feed",
  feedUrl = "https://www.ablog.com/feed",
+ isInvalidUrl = false,
+ onFeedNameUpdated = {},
+ onFeedUrlUpdated = {},
+ addFeed = { },
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun AddScreenContentInvalidUrlPreview() {
+ FeedFlowTheme {
+ AddFeedScreenContent(
+ feedName = "My Feed",
+ feedUrl = "https://www.ablog.com/feed",
+ isInvalidUrl = true,
  onFeedNameUpdated = {},
  onFeedUrlUpdated = {},
  addFeed = { },

i18n/src/commonMain/resources/MR/base/strings.xml

@@ -44,4 +44,5 @@
  <string name="open_website_button">Open website</string>
  <string name="database_error">Something went wrong during the retrieval of the feeds. Please retry or restart the app :(</string>
  <string name="force_feed_refresh">Force feeds refresh</string>
+ <string name="invalid_rss_url">The link you provided is not a valid RSS feed</string>
 </resources>

iosApp/Source/Settings/AddFeed/AddFeedScreen.swift

@@ -11,53 +11,66 @@ import shared
 import KMPNativeCoroutinesAsync
 
 struct AddFeedScreen: View {
-
+ 
  @EnvironmentObject var appState: AppState
  @Environment(\.presentationMode) var presentationMode
-
+ 
  @State private var feedName = ""
  @State private var feedURL = ""
-
+ @State private var isInvalidUrl = false
+
  @StateObject var addFeedViewModel: AddFeedViewModel = KotlinDependencies.shared.getAddFeedViewModel()
-
+ 
  var body: some View {
- VStack {
+ VStack(alignment: .leading) {
  TextField(
  MR.strings().feed_name.localized,
  text: $feedName
  )
  .textFieldStyle(RoundedBorderTextFieldStyle())
  .padding(.top, Spacing.regular)
  .padding(.horizontal, Spacing.regular)
-
+ 
  TextField(
  MR.strings().feed_url.localized,
  text: $feedURL
  )
  .keyboardType(.webSearch)
+ .border(isInvalidUrl ? Color.red : Color.clear)
  .textFieldStyle(RoundedBorderTextFieldStyle())
  .padding(.top, Spacing.regular)
  .padding(.horizontal, Spacing.regular)
-
- Button(
- action: {
- addFeedViewModel.addFeed()
- },
- label: {
- Text(MR.strings().add_feed.localized)
- }
- )
- .buttonStyle(.bordered)
- .padding(.top, Spacing.regular)
-
- Spacer()
- }
- .toolbar {
- ToolbarItem(placement: .navigationBarLeading) {
- Text(MR.strings().add_feed.localized)
- .font(.title2)
+
+ if isInvalidUrl {
+ Text(MR.strings().invalid_rss_url.localized)
+ .padding(.horizontal, Spacing.regular)
+ .frame(alignment: .leading)
+ .font(.caption)
+ .foregroundColor(.red)
+ }
+
+ HStack {
+ Spacer()
+
+ Button(
+ action: {
+ addFeedViewModel.addFeed()
+ },
+ label: {
+ Text(MR.strings().add_feed.localized)
+ }
+ )
+ .frame(alignment: .center)
+ .buttonStyle(.bordered)
+ .padding(.top, Spacing.regular)
+
+ Spacer()
  }
+
+ Spacer()
  }
+ .navigationTitle(MR.strings().add_feed.localized)
+ .navigationBarTitleDisplayMode(.inline)
  .onChange(of: feedName) { value in
  addFeedViewModel.updateFeedNameTextFieldValue(feedNameTextFieldValue: value)
  }
@@ -88,6 +101,22 @@ struct AddFeedScreen: View {
  )
  }
  }
+ .task {
+ do {
+ let stream = asyncSequence(for: addFeedViewModel.isInvalidRssFeedFlow)
+ for try await isInvalidRss in stream {
+ self.isInvalidUrl = isInvalidRss as? Bool ?? false
+ }
+ } catch {
+ self.appState.snackbarQueue.append(
+ SnackbarData(
+ title: MR.strings().generic_error_message.localized,
+ subtitle: nil,
+ showBanner: true
+ )
+ )
+ }
+ }
  }
 }
 

shared/src/androidMain/kotlin/com/prof18/feedflow/domain/opml/OpmlFeedHandler.kt

@@ -16,7 +16,7 @@ import java.io.Reader
 internal actual class OpmlFeedHandler(
  private val dispatcherProvider: DispatcherProvider,
 ) {
- actual suspend fun importFeed(opmlInput: OpmlInput): List<ParsedFeedSource> =
+ actual suspend fun generateFeedSources(opmlInput: OpmlInput): List<ParsedFeedSource> =
  withContext(dispatcherProvider.default) {
  val inputStream = opmlInput.inputStream
  val feedSources = mutableListOf<ParsedFeedSource>()

shared/src/androidUnitTest/kotlin/com/prof18/feedflow/OPMLFeedParserTest.kt

@@ -24,13 +24,13 @@ class OPMLFeedParserTest {
 
  @Test
  fun `The number of feeds are correct`() = runTest {
- val feedSources = parser.importFeed(opmlInput)
+ val feedSources = parser.generateFeedSources(opmlInput)
  assertTrue(feedSources.size == 6)
  }
 
  @Test
  fun `The number of feed in category are correct`() = runTest {
- val feedSources = parser.importFeed(opmlInput)
+ val feedSources = parser.generateFeedSources(opmlInput)
 
  val techFeeds = feedSources.filter { it.category == "Tech" }
  val basketFeeds = feedSources.filter { it.category == "Basket" }
@@ -43,7 +43,7 @@ class OPMLFeedParserTest {
 
  @Test
  fun `The feeds are parsed correctly`() = runTest {
- val feedSources = parser.importFeed(opmlInput)
+ val feedSources = parser.generateFeedSources(opmlInput)
 
  assertEquals("Hacker News", feedSources[0].title)
  assertEquals("https://news.ycombinator.com/rss", feedSources[0].url)
@@ -75,7 +75,7 @@ class OPMLFeedParserTest {
  val opmlInput = OpmlInput(
  inputStream = opmlWithText.byteInputStream(),
  )
- val feedSources = parser.importFeed(opmlInput)
+ val feedSources = parser.generateFeedSources(opmlInput)
  assertTrue(feedSources.isNotEmpty())
  }
 }

shared/src/commonMain/kotlin/com/prof18/feedflow/di/Koin.kt

@@ -1,6 +1,5 @@
 package com.prof18.feedflow.di
 
-import co.touchlab.kermit.ExperimentalKermitApi
 import co.touchlab.kermit.Logger
 import co.touchlab.kermit.StaticConfig
 import co.touchlab.kermit.platformLogWriter
@@ -38,7 +37,6 @@ fun initKoin(
  }
 }
 
-@OptIn(ExperimentalKermitApi::class)
 private fun getLoggingModule(appEnvironment: AppEnvironment): Module =
  module {
  val loggers = mutableListOf(platformLogWriter())
@@ -79,6 +77,8 @@ private val coreModule = module {
  databaseHelper = get(),
  opmlFeedHandler = get(),
  settingsHelper = get(),
+ rssParser = get(),
+ logger = getWith("FeedManagerRepositoryImpl"),
  )
  }
 

shared/src/commonMain/kotlin/com/prof18/feedflow/domain/feed/manager/FeedManagerRepository.kt

@@ -10,6 +10,7 @@ interface FeedManagerRepository {
  suspend fun addFeedsFromFile(opmlInput: OpmlInput)
  suspend fun getFeeds(): Flow<List<FeedSource>>
  suspend fun addFeed(url: String, name: String)
+ suspend fun checkIfValidRss(url: String): Boolean
  suspend fun exportFeedsAsOpml(opmlOutput: OpmlOutput)
  suspend fun deleteFeed(feedSource: FeedSource)
  fun getFavouriteBrowserId(): String?

shared/src/commonMain/kotlin/com/prof18/feedflow/domain/feed/manager/FeedManagerRepositoryImpl.kt

@@ -1,5 +1,6 @@
 package com.prof18.feedflow.domain.feed.manager
 
+import co.touchlab.kermit.Logger
 import com.prof18.feedflow.core.model.FeedSource
 import com.prof18.feedflow.data.DatabaseHelper
 import com.prof18.feedflow.data.SettingsHelper
@@ -8,17 +9,22 @@ import com.prof18.feedflow.domain.model.ParsedFeedSource
 import com.prof18.feedflow.domain.opml.OpmlFeedHandler
 import com.prof18.feedflow.domain.opml.OpmlInput
 import com.prof18.feedflow.domain.opml.OpmlOutput
+import com.prof18.rssparser.RssParser
 import kotlinx.coroutines.flow.Flow
 
 internal class FeedManagerRepositoryImpl(
  private val databaseHelper: DatabaseHelper,
  private val opmlFeedHandler: OpmlFeedHandler,
  private val settingsHelper: SettingsHelper,
+ private val rssParser: RssParser,
+ private val logger: Logger,
 ) : FeedManagerRepository {
  override suspend fun addFeedsFromFile(opmlInput: OpmlInput) {
- val feeds = opmlFeedHandler.importFeed(opmlInput)
+ val feeds = opmlFeedHandler.generateFeedSources(opmlInput)
  val categories = feeds.mapNotNull { it.category }.distinct()
 
+ // TODO: check url and returns
+
  databaseHelper.insertCategories(categories)
  databaseHelper.insertFeedSource(feeds)
  }
@@ -54,4 +60,15 @@ internal class FeedManagerRepositoryImpl(
  override fun setFavouriteBrowser(browser: Browser) {
  settingsHelper.saveFavouriteBrowserId(browser.id)
  }
+
+ @Suppress("TooGenericExceptionCaught")
+ override suspend fun checkIfValidRss(url: String): Boolean {
+ return try {
+ rssParser.getRssChannel(url)
+ true
+ } catch (e: Throwable) {
+ logger.d { "Wrong url input: $e" }
+ false
+ }
+ }
 }

shared/src/commonMain/kotlin/com/prof18/feedflow/domain/opml/OpmlFeedHandler.kt

@@ -4,6 +4,6 @@ import com.prof18.feedflow.core.model.FeedSource
 import com.prof18.feedflow.domain.model.ParsedFeedSource
 
 internal expect class OpmlFeedHandler {
- suspend fun importFeed(opmlInput: OpmlInput): List<ParsedFeedSource>
+ suspend fun generateFeedSources(opmlInput: OpmlInput): List<ParsedFeedSource>
  suspend fun exportFeed(opmlOutput: OpmlOutput, feedSources: List<FeedSource>)
 }