Merge branch 'master' into bump

.gitea/workflows/common_build.yml

@@ -26,10 +26,9 @@ jobs:
       - uses: KengoTODA/actions-setup-docker-compose@v1
         with:
           version: "2.23.3"
-      #      TESTS ARE RUN LOCALLY
-      #      - name: run selfoss
-      #        run: |
-      #          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
+      - name: run selfoss
+        run: |
+          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
       - name: coverage
         run: |
           ./gradlew :koverHtmlReport
@@ -40,8 +39,7 @@ jobs:
           retention-days: 1
           overwrite: true
           include-hidden-files: true
-#      TESTS ARE RUN LOCALLY
-#      - name: Clean
-#        if: always()
-#        run: |
-#          docker compose -f .gitea/workflows/assets/docker-compose.yml stop
+      - name: Clean
+        if: always()
+        run: |
+          docker compose -f .gitea/workflows/assets/docker-compose.yml stop

.gitignore

@@ -323,6 +323,4 @@ fabric.properties
 crowdin.properties
 
 .kotlin/
-build-cache/
-
-act
+build-cache/

CHANGELOG.md

@@ -1,23 +1,3 @@
-**v125020471
-
-- chore: no more docker-compose.
-- bump: gradle plugin.
-- Merge pull request 'fix: check index exists.' (#183) from fix-index into master
-- fix: check index exists.
-- Changelog for v125020411
-
---------------------------------------------------------------------
-
-**v125020411
-
-- Merge pull request 'bump' (#182) from bump into master
-- chore: non transiant R classes.
-- Merge pull request 'fix: One more missing context.' (#181) from fix-one-more-context into master
-- bump
-- fix: One more missing context.
-
---------------------------------------------------------------------
-
 **v125010241
 
 - Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt

@@ -56,7 +56,7 @@ class HomeActivityTest {
     fun testMenuActions() {
         onView(withId(R.id.action_search)).perform(click())
         onView(
-            withId(com.google.android.material.R.id.search_src_text),
+            withId(R.id.search_src_text),
         ).check(matches(isFocused()))
         onView(isRoot()).perform(ViewActions.pressBack())
 

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt

@@ -161,14 +161,12 @@ class ReaderActivity :
                     override fun onPageSelected(position: Int) {
                         super.onPageSelected(position)
 
-                        if (!allItems.isNullOrEmpty() && allItems.size >= position) {
-                            if (allItems[position].starred) {
-                                canRemoveFromFavorite()
-                            } else {
-                                canFavorite()
-                            }
-                            readItem(allItems[position])
+                        if (allItems[position].starred) {
+                            canRemoveFromFavorite()
+                        } else {
+                            canFavorite()
                         }
+                        readItem(allItems[position])
                     }
                 },
             )

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt

@@ -75,7 +75,7 @@ class ArticleFragment :
     private var colorSurface: Int = 0
     private var fontSize: Int = DEFAULT_FONT_SIZE
     private lateinit var item: SelfossModel.Item
-    private var url: String? = null
+    private lateinit var url: String
     private lateinit var contentText: String
     private lateinit var contentSource: String
     private lateinit var contentImage: String
@@ -118,8 +118,8 @@ class ArticleFragment :
                 e.sendSilentlyWithAcra()
             }
 
-            colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface)
-            colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface)
+            colorOnSurface = getColorFromAttr(R.attr.colorOnSurface)
+            colorSurface = getColorFromAttr(R.attr.colorSurface)
 
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
@@ -168,8 +168,8 @@ class ArticleFragment :
 
     private fun handleContent() {
         if (contentText.isEmptyOrNullOrNullString()) {
-            if (repository.isNetworkAvailable() && url.isUrlValid()) {
-                getContentFromMercury(url!!)
+            if (repository.isNetworkAvailable()) {
+                getContentFromMercury()
             }
         } else {
             binding.titleView.text = contentTitle
@@ -271,7 +271,7 @@ class ArticleFragment :
     }
 
     @Suppress("detekt:SwallowedException")
-    private fun getContentFromMercury(url: String) {
+    private fun getContentFromMercury() {
         binding.progressBar.visibility = View.VISIBLE
 
         CoroutineScope(Dispatchers.Main).launch {
@@ -424,10 +424,10 @@ class ArticleFragment :
 
         var baseUrl: String? = null
         try {
-            val itemUrl = URL(url.orEmpty())
+            val itemUrl = URL(url)
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
-            e.sendSilentlyWithAcraWithName("htmlToWebview > ${url.orEmpty()}")
+            e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
         }
 
         val fontName: String =

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/AppUtils.kt

@@ -11,24 +11,22 @@ import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcra
 import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 
 fun Context.shareLink(
-    itemUrl: String?,
+    itemUrl: String,
     itemTitle: String,
 ) {
-    if (itemUrl.isUrlValid()) {
-        val sendIntent = Intent()
-        sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        sendIntent.action = Intent.ACTION_SEND
-        sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl!!.toStringUriWithHttp())
-        sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
-        sendIntent.type = "text/plain"
-        startActivity(
-            Intent
-                .createChooser(
-                    sendIntent,
-                    getString(R.string.share),
-                ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
-        )
-    }
+    val sendIntent = Intent()
+    sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    sendIntent.action = Intent.ACTION_SEND
+    sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
+    sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
+    sendIntent.type = "text/plain"
+    startActivity(
+        Intent
+            .createChooser(
+                sendIntent,
+                getString(R.string.share),
+            ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+    )
 }
 
 @ColorInt

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/LinksUtils.kt

@@ -15,12 +15,12 @@ import android.widget.Toast
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.ReaderActivity
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
-import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
+import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
 fun Context.openItemUrl(
     currentItem: Int,
-    linkDecoded: String?,
+    linkDecoded: String,
     articleViewer: Boolean,
     app: Activity,
 ) {
@@ -37,13 +37,12 @@ fun Context.openItemUrl(
             intent.putExtra("currentItem", currentItem)
             app.startActivity(intent)
         } else {
-            this.openUrlInBrowserAsNewTask(linkDecoded!!)
+            this.openUrlInBrowserAsNewTask(linkDecoded)
         }
     }
 }
 
-fun String?.isUrlValid(): Boolean =
-    !this.isEmptyOrNullOrNullString() && this!!.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+fun String.isUrlValid(): Boolean = this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
 
 fun String.isBaseUrlInvalid(): Boolean {
     val baseUrl = this.toHttpUrlOrNull()
@@ -57,16 +56,14 @@ fun String.isBaseUrlInvalid(): Boolean {
 }
 
 fun Context.openItemUrlInBrowserAsNewTask(i: SelfossModel.Item) {
-    this.openUrlInBrowserAsNewTask(i.getLinkDecoded())
+    this.openUrlInBrowserAsNewTask(i.getLinkDecoded().toStringUriWithHttp())
 }
 
-fun Context.openUrlInBrowserAsNewTask(url: String?) {
-    if (url.isUrlValid()) {
-        val intent = Intent(Intent.ACTION_VIEW)
-        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        intent.data = Uri.parse(url)
-        this.mayBeStartActivity(intent)
-    }
+fun Context.openUrlInBrowserAsNewTask(url: String) {
+    val intent = Intent(Intent.ACTION_VIEW)
+    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    intent.data = Uri.parse(url)
+    this.mayBeStartActivity(intent)
 }
 
 fun Context.openUrlInBrowser(url: String) {

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     // trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.8.1").apply(false)
-    id("com.android.library").version("8.8.1").apply(false)
+    id("com.android.application").version("8.8.0").apply(false)
+    id("com.android.library").version("8.8.0").apply(false)
     id("org.jetbrains.kotlin.android").version("2.1.0").apply(false)
     kotlin("multiplatform").version("2.1.0").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)

fastlane/metadata/android/en-US/changelogs/v125020411.txt

@@ -1,7 +0,0 @@
-**v125020411**
-
-- Merge pull request 'bump' (#182) from bump into master
-- chore: non transiant R classes.
-- Merge pull request 'fix: One more missing context.' (#181) from fix-one-more-context into master
-- bump
-- fix: One more missing context.

fastlane/metadata/android/en-US/changelogs/v125020471.txt

@@ -1,7 +0,0 @@
-**v125020471**
-
-- chore: no more docker-compose.
-- bump: gradle plugin.
-- Merge pull request 'fix: check index exists.' (#183) from fix-index into master
-- fix: check index exists.
-- Changelog for v125020411

gradle.properties

@@ -19,11 +19,11 @@ kotlin.code.style=official
 android.useAndroidX=true
 #android.nonTransitiveRClass=true
 android.enableJetifier=false
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=false
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
 kotlin.native.cacheKind.iosX64=none
-org.gradle.configureondemand=true
+org.gradle.configureondemand=true

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt

@@ -127,8 +127,8 @@ class SelfossModel {
         val tags: List<String>,
         val author: String? = null,
     ) {
-        fun getLinkDecoded(): String? {
-            var stringUrl: String?
+        fun getLinkDecoded(): String {
+            var stringUrl: String
             stringUrl =
                 if (link.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
                     link.substringAfter("&amp;url=")
@@ -146,7 +146,11 @@ class SelfossModel {
                 stringUrl = "http:$stringUrl"
             }
 
-            return if (stringUrl.isEmptyOrNullOrNullString()) null else stringUrl
+            if (stringUrl.isEmptyOrNullOrNullString()) {
+                throw ModelException("Link $link was translated to $stringUrl, but was empty. Handle this.")
+            }
+
+            return stringUrl
         }
 
         fun sourceAuthorAndDate(): String {