fix: Another date format thing.

.drone.yml

@@ -75,7 +75,7 @@ steps:
   - name: scpFiles
     image: appleboy/drone-scp
     settings:
-      host: amine-louveau.fr
+      host: amine-bouabdallaoui.fr
       username: ubuntu
       key:
         from_secret: privateKey
@@ -86,7 +86,7 @@ steps:
   - name: deploy
     image: appleboy/drone-ssh
     settings:
-      host: amine-louveau.fr
+      host: amine-bouabdallaoui.fr
       user: ubuntu
       key:
         from_secret: privateKey
@@ -120,7 +120,7 @@ steps:
       - ./gradlew :androidApp:assembleGithubConfigRelease
       - echo "---------------------------------------------------------"
       - echo "Get Key"
-      - wget https://amine-louveau.fr/key
+      - wget https://amine-bouabdallaoui.fr/key
       - echo "---------------------------------------------------------"
       - echo "Zipalign"
       - $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
@@ -142,7 +142,7 @@ steps:
     settings:
       api_key:
         from_secret: giteaAPI
-      base_url: https://gitea.amine-louveau.fr
+      base_url: https://gitea.amine-bouabdallaoui.fr
       files: signed.apk
 
   - name: notify

.github/CONTRIBUTING.md

@@ -10,7 +10,7 @@ Please read the guidelines before contributing, and follow them (or try to) when
 
 There are many ways to contribute to this project, you could [translate the app](https://crowdin.com/project/readerforselfoss), report bugs, request missing features, suggest enhancements and changes to existing ones. You also can improve the README with useful tips that could help the other users.
 
-You can fork the repository, and [help me solve some issues](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
+You can fork the repository, and [help me solve some issues](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
 
 ### What I can't help you with.
 

CHANGELOG.md

@@ -1,3 +1,33 @@
+**v124010031**
+
+- fix: Checking if selfoss instance.
+- fix: handle three characters lenght hexcode colors.
+- Changelog for v123113311 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123113311**
+
+- chore: Source tracker url in the menu.
+- fix: Handle kodein proguard rules.
+- Changelog for v123102961 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123102961**
+
+- chore: domain changes.
+- Changelog for v123102852 [CI SKIP]
+
+--------------------------------------------------------------------
+
+**v123102852**
+
+- chore: lint cleaning.
+- Changelog for v123102841 [CI SKIP]
+
+--------------------------------------------------------------------
+
 **v123102841**
 
 - chore: cleaning ci steps and upgrading dependencies.

README.md

@@ -1,4 +1,4 @@
-# ReaderForSelfoss-multiplatform [![Build Status](https://build.amine-louveau.fr/api/badges/Louvorg/ReaderForSelfoss-multiplatform/status.svg)](https://build.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform)
+# ReaderForSelfoss-multiplatform [![Build Status](https://build.amine-bouabdallaoui.fr/api/badges/Louvorg/ReaderForSelfoss-multiplatform/status.svg)](https://build.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform)
 
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/readerforselfoss/localized.svg)](https://crowdin.com/project/readerforselfoss)
 
@@ -22,15 +22,15 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 
 1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
 
-2. Check the [Contribution guide](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
+2. Check the [Contribution guide](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
 
-3. Build the project by following [these steps](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
+3. Build the project by following [these steps](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
 
 ## Useful links
 
-- [Check what changed](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
-- [See what I'm doing](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
-- [Create an issue, or request a new feature](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
+- [Check what changed](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
+- [See what I'm doing](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
+- [Create an issue, or request a new feature](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
 - [Help translation the app](https://crowdin.com/project/readerforselfoss)
 
 ## Contributors (V1) (Alphabetical order) ❤️

androidApp/proguard-rules.pro

@@ -86,3 +86,12 @@
 
 -dontwarn io.mockk.**
 -keep class io.mockk.** { *; }
+
+
+
+# Kodein
+-keep, allowobfuscation, allowoptimization class org.kodein.type.TypeReference
+-keep, allowobfuscation, allowoptimization class org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest
+
+-keep, allowobfuscation, allowoptimization class * extends org.kodein.type.TypeReference
+-keep, allowobfuscation, allowoptimization class * extends org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest

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

@@ -1,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.android
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -565,6 +566,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
+            R.id.issue_tracker -> {
+                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
+                startActivity(browserIntent)
+                return true
+            }
             R.id.action_filter -> {
                 val filterSheetFragment = FilterSheetFragment()
                 filterSheetFragment.show(supportFragmentManager, FilterSheetFragment.TAG)

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

@@ -4,6 +4,7 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.Menu
@@ -139,20 +140,25 @@ class LoginActivity : AppCompatActivity(), DIAware {
         repository.refreshLoginInformation(url, login, password)
 
         CoroutineScope(Dispatchers.Main).launch {
-            repository.updateApiInformation()
+            try {
+                repository.updateApiInformation()
+            } catch (e: Exception) {
+                if (e.message?.startsWith("No transformation found") == true) {
+                    Toast.makeText(
+                        applicationContext,
+                        R.string.application_selfoss_only,
+                        Toast.LENGTH_LONG,
+                    ).show()
+                    preferenceError()
+                    showProgress(false)
+                }
+            }
             val result = repository.login()
             if (result) {
-                val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
-                if (!errorFetching && !displaySelfossOnly) {
+                val errorFetching = repository.checkIfFetchFails()
+                if (!errorFetching) {
                     goToMain()
                 } else {
-                    if (displaySelfossOnly) {
-                        Toast.makeText(
-                            applicationContext,
-                            R.string.application_selfoss_only,
-                            Toast.LENGTH_LONG,
-                        ).show()
-                    }
                     preferenceError()
                 }
             } else {
@@ -254,10 +260,17 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
+            R.id.issue_tracker -> {
+                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
+                startActivity(browserIntent)
+                return true
+            }
             R.id.about -> {
                 LibsBuilder()
                     .withAboutIconShown(true)
                     .withAboutVersionShown(true)
+                    .withAboutSpecial2("Bug reports").withAboutSpecial2Description(AppSettingsService.trackerUrl)
+                    .withAboutSpecial1("Project Page").withAboutSpecial1Description(AppSettingsService.sourceUrl)
                     .start(this)
                 true
             }

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

@@ -132,7 +132,7 @@ class MyApp : MultiDexApplication(), DIAware {
             }
             httpSender {
                 uri =
-                    "https://bugs.amine-louveau.fr/report" // best guess, you may need to adjust this
+                    "https://bugs.amine-bouabdallaoui.fr/report" // best guess, you may need to adjust this
                 basicAuthLogin = "qMEscjj89Gwt6cPR"
                 basicAuthPassword = "Yo58QFlGzFaWlBzP"
                 httpMethod = HttpSender.Method.POST

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

@@ -17,6 +17,7 @@ import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.utils.getColorHexCode
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getIcon
 import com.bumptech.glide.Glide
@@ -147,9 +148,9 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
                     val gd = GradientDrawable()
                     val gdColor =
                         try {
-                            Color.parseColor(tag.color)
+                            Color.parseColor(tag.getColorHexCode())
                         } catch (e: IllegalArgumentException) {
-                            e.sendSilentlyWithAcraWithName("color issue " + tag.color)
+                            e.sendSilentlyWithAcraWithName("color issue " + tag.color + " / " + tag.getColorHexCode())
                             resources.getColor(R.color.colorPrimary)
                         }
                     gd.setColor(gdColor)

androidApp/src/main/res/menu/home_menu.xml

@@ -36,6 +36,12 @@
         android:orderInCategory="101"
         android:title="@string/menu_home_refresh" />
 
+    <item
+        android:id="@+id/issue_tracker"
+        app:showAsAction="never"
+        android:orderInCategory="103"
+        android:title="@string/issue_tracker_link" />
+
     <item android:id="@+id/action_disconnect"
           android:title="@string/action_disconnect"
           android:orderInCategory="104"

androidApp/src/main/res/menu/login_menu.xml

@@ -3,6 +3,13 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
+
+    <item
+        android:id="@+id/issue_tracker"
+        app:showAsAction="never"
+        android:orderInCategory="101"
+        android:title="@string/issue_tracker_link" />
+
     <item android:id="@+id/about"
           android:title="@string/action_about"
           android:orderInCategory="102"

androidApp/src/test/kotlin/DatesTest.kt

@@ -13,6 +13,8 @@ class DatesTest {
     private val oldVersionDate = "2013-05-07 13:46:00"
     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() {
         val date = DateUtils.parseDate(newVersionDate)
@@ -52,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)
+    }
 }

build.gradle.kts

@@ -17,7 +17,6 @@ plugins {
 
 allprojects {
     repositories {
-        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
         google()
         mavenCentral()
         maven { url = uri("https://www.jitpack.io") }

docs/index.html

@@ -68,9 +68,9 @@ redirect_from: "/ReaderforSelfoss-multiplatform/"
             <div id="links">
 
 
-                <a class="github-button" href="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a>
+                <a class="github-button" href="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a>
             </div>
-            <meta itemprop="url" content="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform">
+            <meta itemprop="url" content="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform">
             <meta itemprop="applicationCategory" content="News & Magazines">
         </div>
     </body>

settings.gradle.kts

@@ -1,6 +1,5 @@
 pluginManagement {
     repositories {
-        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
         google()
         gradlePluginPortal()
         mavenCentral()
@@ -9,7 +8,6 @@ pluginManagement {
 
 dependencyResolutionManagement {
     repositories {
-        // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
         google()
         mavenCentral()
     }

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

@@ -1,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.utils
 
 import android.text.format.DateUtils
+import io.github.aakira.napier.Napier
 import kotlinx.datetime.*
 
 actual class DateUtils {
@@ -16,12 +17,17 @@ actual class DateUtils {
         // For now, we handle this in a hacky way, because kotlin only accepts iso formats
         actual fun parseDate(dateString: String): Long {
             var isoDateString: String =
-                if (dateString.matches(oldVersionFormat)) {
-                    dateString.replace(" ", "T")
-                } else if (dateString.matches(newVersionFormat)) {
-                    dateString.split("+")[0]
-                } else {
-                    throw Exception("Unrecognized format for $dateString")
+                try {
+                    if (dateString.matches(oldVersionFormat)) {
+                        dateString.replace(" ", "T")
+                    } else if (dateString.matches(newVersionFormat)) {
+                        dateString.split("+")[0]
+                    } else {
+                        throw Exception("Unrecognized format for $dateString")
+                    }
+                } catch (e: Exception) {
+                    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/repository/RepositoryImpl.kt

@@ -8,7 +8,6 @@ import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.*
 import io.github.aakira.napier.Napier
-import io.ktor.client.call.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -429,22 +428,19 @@ class Repository(
         return result
     }
 
-    suspend fun shouldBeSelfossInstance(): Pair<Boolean, Boolean> {
+    suspend fun checkIfFetchFails(): Boolean {
         var fetchFailed = true
-        var showSelfossOnlyModal = false
         if (isNetworkAvailable()) {
             try {
                 // Trying to fetch one item, and check someone is trying to use the app with
                 // a random rss feed, that would throw a NoTransformationFoundException
                 fetchFailed = !api.getItemsWithoutCatch().success
-            } catch (e: NoTransformationFoundException) {
-                showSelfossOnlyModal = true
             } catch (e: Throwable) {
                 Napier.e(e.stackTraceToString(), tag = "RepositoryImpl.shouldBeSelfossInstance")
             }
         }
 
-        return Pair(fetchFailed, showSelfossOnlyModal)
+        return fetchFailed
     }
 
     suspend fun logout() {

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/MercuryApi.kt

@@ -40,7 +40,7 @@ class MercuryApi() {
 
     suspend fun query(url: String): StatusAndData<MercuryModel.ParsedContent> =
         bodyOrFailure(
-            client.get("https://amine-louveau.fr/parser.php") {
+            client.get("https://amine-bouabdallaoui.fr/parser.php") {
                 parameter("link", url)
             },
         )

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

@@ -480,9 +480,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
     companion object {
         const val translationUrl = "https://crwd.in/readerforselfoss"
 
-        const val sourceUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform"
+        const val sourceUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform"
 
-        const val trackerUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
+        const val trackerUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
 
         const val syncChannelId = "sync-channel-id"
 

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/utils/EntityUtils.kt

@@ -73,3 +73,13 @@ fun SelfossModel.Item.toEntity(): ITEM =
         this.tags.joinToString(","),
         this.author,
     )
+
+fun SelfossModel.Tag.getColorHexCode(): String =
+    if (this.color.length == 4) { // #000
+        val char1 = this.color.get(1)
+        val char2 = this.color.get(2)
+        val char3 = this.color.get(3)
+        "#$char1$char1$char2$char2$char3$char3"
+    } else {
+        this.color
+    }