CHANGELOG.md

@@ -1,40 +1,3 @@
-**v124041081**
-
-- chore: comment.
-- fix: Last time fixing the parsing date hack before moving it to os version.
-- Changelog for v124030731 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124030731**
-
-- fix: Basic auth and password can have non whitspace characters. Fixes 142.
-- Changelog for v124020451 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124020451**
-
-- fix: Fixed handling of position in card adapter.
-- Changelog for v124010301 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010301**
-
-- fix: This may fix the oom errors.
-- Changelog for v124010191 [CI SKIP]
-
---------------------------------------------------------------------
-
-**v124010191**
-
-- fix: moving listeners.
-- chore: removed a useless log.
-- Changelog for v124010032 [CI SKIP]
-
---------------------------------------------------------------------
-
 **v124010032**
 
 - fix: Another date format thing.

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

@@ -9,7 +9,6 @@ import android.widget.ImageView.ScaleType
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
-import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
@@ -95,10 +94,10 @@ class ItemCardAdapter(
         position: Int,
     ) {
         with(holder) {
-            val itm = items[holder.bindingAdapterPosition]
+            val itm = items[position]
 
-            handleClickListeners(holder.bindingAdapterPosition)
+            handleClickListeners(position)
-            handleLinkOpening(holder.bindingAdapterPosition)
+            handleLinkOpening(position)
 
             binding.favButton.isSelected = itm.starred
             if (appSettingsService.getPublicAccess()) {
@@ -111,12 +110,7 @@ class ItemCardAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = try {
+            binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate()
-                itm.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("ItemCardAdapter parse date")
-                itm.sourceAuthorOnly()
-            }
 
             if (!appSettingsService.isFullHeightCardsEnabled()) {
                 binding.itemImage.maxHeight = imageMaxHeight

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

@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
-import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
@@ -46,13 +45,13 @@ class ItemListAdapter(
         position: Int,
     ) {
         with(holder) {
-            val itm = items[holder.bindingAdapterPosition]
+            val itm = items[position]
 
             binding.root.setOnClickListener {
                 repository.setReaderItems(items)
                 c.openItemUrl(
-                    holder.bindingAdapterPosition,
+                    bindingAdapterPosition,
-                    items[holder.bindingAdapterPosition].getLinkDecoded(),
+                    items[bindingAdapterPosition].getLinkDecoded(),
                     appSettingsService.isArticleViewerEnabled(),
                     app,
                 )
@@ -64,12 +63,7 @@ class ItemListAdapter(
 
             binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))
 
-            binding.sourceTitleAndDate.text = try {
+            binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate()
-                itm.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("ItemListAdapter parse date")
-                itm.sourceAuthorOnly()
-            }
 
             if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
                 if (itm.getIcon(repository.baseUrl).isEmpty()) {

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

@@ -89,7 +89,6 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         if (repository.displayedItems == ItemType.UNREAD) {
             items.remove(item)
             notifyItemRemoved(position)
-            notifyItemRangeChanged(position, itemCount)
             updateItems(items)
         } else {
             notifyItemChanged(position)

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

@@ -102,12 +102,7 @@ class ArticleFragment : Fragment(), DIAware {
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()
             contentImage = item.getThumbnail(repository.baseUrl)
-            contentSource = try {
+            contentSource = item.sourceAuthorAndDate()
-                item.sourceAuthorAndDate()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("Article Fragment parse date")
-                item.sourceAuthorOnly()
-            }
             allImages = item.getImages()
 
             fontSize = appSettingsService.getFontSize()

androidApp/src/test/kotlin/DatesTest.kt

@@ -8,12 +8,12 @@ import kotlinx.datetime.toInstant
 import org.junit.Test
 
 class DatesTest {
-    private val newVersionDateVariant =     "2022-12-24T17:00:08+00"
+    private val newVersionDateVariant = "2022-12-24T17:00:08+00"
-    private val newVersionDate =            "2013-04-07T13:43:00+01:00"
+    private val newVersionDate = "2013-04-07T13:43:00+01:00"
-    private val newVersionDate2 =            "2013-04-07T13:43:00-01:00"
+    private val oldVersionDate = "2013-05-07 13:46:00"
-    private val oldVersionDate =            "2013-05-07 13:46:00"
+    private val oldVersionDateVariant = "2021-03-21 10:32:00.000000"
-    private val oldVersionDateVariant =     "2021-03-21 10:32:00.000000"
 
+    private val bugVersionDate = "2023-12-19T10:30:53-05:00"
 
     @Test
     fun new_version_date_should_be_parsed() {
@@ -24,15 +24,6 @@ class DatesTest {
 
         assertEquals(expected, date)
     }
-    @Test
-    fun new_version_date2_should_be_parsed() {
-        val date = DateUtils.parseDate(newVersionDate2)
-        val expected =
-            LocalDateTime(2013, 4, 7, 13, 43, 0, 0).toInstant(TimeZone.currentSystemDefault())
-                .toEpochMilliseconds()
-
-        assertEquals(expected, date)
-    }
 
     @Test
     fun old_version_date_should_be_parsed() {
@@ -63,4 +54,14 @@ class DatesTest {
 
         assertEquals(expected, date)
     }
+
+    @Test
+    fun bug_version_variant_date_should_be_parsed() {
+        val date = DateUtils.parseDate(bugVersionDate)
+        val expected =
+            LocalDateTime(1991, 3, 18, 3, 0, 0, 0).toInstant(TimeZone.currentSystemDefault())
+                .toEpochMilliseconds()
+
+        assertEquals(expected, date)
+    }
 }

shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt

@@ -11,21 +11,23 @@ actual class DateUtils {
         private val oldVersionFormat = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}(.()\\d*)?".toRegex()
 
         // yyyy-MM-dd'T'HH:mm:ss[.SSS]XXX (RFC3339)
-        private val newVersionFormat = "(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2})[+-](\\d{2}(:\\d{2})?)?".toRegex()
+        private val newVersionFormat = "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+\\d{2}(:\\d{2})?".toRegex()
 
-        // TODO: do not fix any more issues here. Move everything to plateform specific code.
+        // We may need to consider moving the formatting to platform specific code, even if the tests are doubled
+        // For now, we handle this in a hacky way, because kotlin only accepts iso formats
         actual fun parseDate(dateString: String): Long {
             var isoDateString: String =
                 try {
                     if (dateString.matches(oldVersionFormat)) {
                         dateString.replace(" ", "T")
                     } else if (dateString.matches(newVersionFormat)) {
-                        newVersionFormat.find(dateString)?.groups?.get(1)?.value ?: throw Exception("Couldn't parse $dateString")
+                        dateString.split("+")[0]
                     } else {
                         throw Exception("Unrecognized format for $dateString")
                     }
                 } catch (e: Exception) {
-                    throw Exception("parseDate failed for $dateString", e)
+                    Napier.e(e.stackTraceToString(), tag = "DateUtils.parseDate")
+                    "1991-03-18T03:00:00"
                 }
 
             return LocalDateTime.parse(isoDateString).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()

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

@@ -146,14 +146,6 @@ class SelfossModel {
             return txt
         }
 
-        fun sourceAuthorOnly(): String {
-            var txt = this.sourcetitle.getHtmlDecoded()
-            if (!this.author.isNullOrBlank()) {
-                txt += " (by ${this.author}) "
-            }
-            return txt
-        }
-
         fun toggleStar(): Item {
             this.starred = !this.starred
             return this

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -422,7 +422,7 @@ class Repository(
                 val response = api.login()
                 result = response.isSuccess == true
             } catch (cause: Throwable) {
-                Napier.e("login failed", cause, tag = "RepositoryImpl.login")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.login")
             }
         }
         return result
@@ -436,7 +436,7 @@ class Repository(
                 // a random rss feed, that would throw a NoTransformationFoundException
                 fetchFailed = !api.getItemsWithoutCatch().success
             } catch (e: Throwable) {
-                Napier.e("checkIfFetchFails failed", e, tag = "RepositoryImpl.shouldBeSelfossInstance")
+                Napier.e(e.stackTraceToString(), tag = "RepositoryImpl.shouldBeSelfossInstance")
             }
         }
 
@@ -451,7 +451,7 @@ class Repository(
                     Napier.e("Couldn't logout.", tag = "RepositoryImpl.logout")
                 }
             } catch (cause: Throwable) {
-                Napier.e("logout failed", cause, tag = "RepositoryImpl.logout")
+                Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.logout")
             }
             appSettingsService.clearAll()
         } else {

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt

@@ -441,7 +441,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         login: String,
         password: String,
     ) {
-        val regex = """\/\/(\S+):(\S+)@""".toRegex()
+        val regex = """\/\/(\D+):(\D+)@""".toRegex()
         val matchResult = regex.find(url)
         if (matchResult != null) {
             val (basicLogin, basicPassword) = matchResult.destructured