.drone.yml

@@ -48,14 +48,13 @@ steps:
     commands:
       - apt-get update && apt-get install -y git
       - git fetch --tags -p
-      - PREV=$(git describe --tags --abbrev=0)
-      - ./build.sh --publish --from-ci
-      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
       - VER=$(git describe --tags --abbrev=0)
-      - CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
+      - CHANGELOG=$(git log $VER..HEAD --pretty="- %s")
       - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
       - git add CHANGELOG.md
       - git commit -m "Changelog for $VER [CI SKIP]"
+      - ./build.sh --publish --from-ci
+      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
       - git push pushing master
       - git push pushing --tags
     environment:

CHANGELOG.md

@@ -1,21 +1,3 @@
-**v123020523**
-
-- fix: Git changelog.
-
---------------------------------------------------------------------
-
-**v123020491**
-
-- fix: Fixed acra bug reporting.
-
---------------------------------------------------------------------
-
-**v123010301**
-
-- Chore: acra config.
-
---------------------------------------------------------------------
-
 **v123010281**
 
 - improvement: Improve right to left support (#130) Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>

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

@@ -34,7 +34,6 @@ import org.kodein.di.*
 class MyApp : MultiDexApplication(), DIAware {
 
     override val di by DI.lazy {
-        bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess()) }
         import(networkModule)
         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
@@ -131,8 +130,8 @@ class MyApp : MultiDexApplication(), DIAware {
             httpSender {
                 uri =
                     "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
-                basicAuthLogin = "qMEscjj89Gwt6cPR"
+                basicAuthLogin = "LMTlLZuazADohTCm"
-                basicAuthPassword = "Yo58QFlGzFaWlBzP"
+                basicAuthPassword = "he6ghHp83F0PYPfh"
                 httpMethod = HttpSender.Method.POST
             }
         }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/DI/modules.kt

@@ -9,6 +9,7 @@ import org.kodein.di.instance
 import org.kodein.di.singleton
 
 val networkModule by DI.Module {
+    bind<AppSettingsService>() with singleton { AppSettingsService() }
     bind<SelfossApi>() with singleton { SelfossApi(instance()) }
     bind<MercuryApi>() with singleton { MercuryApi() }
 }

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

@@ -1,70 +0,0 @@
-package bou.amine.apps.readerforselfossv2.service
-
-import com.russhwolf.settings.Settings
-
-// This will be used in ACRA process. For now, it does nothing.
-// This is to fix ACRA not sending reports anymore.
-// See https://www.acra.ch/docs/Troubleshooting-Guide#applicationoncreate
-class ACRASettings : Settings {
-    override val keys: Set<String> = emptySet()
-    override val size: Int = 0
-
-    override fun clear() {
-        // Nothing
-    }
-
-    override fun getBoolean(key: String, defaultValue: Boolean): Boolean = false
-
-    override fun getBooleanOrNull(key: String): Boolean? = null
-
-    override fun getDouble(key: String, defaultValue: Double): Double = 0.0
-
-    override fun getDoubleOrNull(key: String): Double? = null
-
-    override fun getFloat(key: String, defaultValue: Float): Float = 0.0F
-
-    override fun getFloatOrNull(key: String): Float? = null
-
-    override fun getInt(key: String, defaultValue: Int): Int = 0
-
-    override fun getIntOrNull(key: String): Int? = null
-
-    override fun getLong(key: String, defaultValue: Long): Long = 0
-
-    override fun getLongOrNull(key: String): Long? = null
-
-    override fun getString(key: String, defaultValue: String): String = "0"
-
-    override fun getStringOrNull(key: String): String? = null
-
-    override fun hasKey(key: String): Boolean = false
-
-    override fun putBoolean(key: String, value: Boolean) {
-        // Nothing
-    }
-
-    override fun putDouble(key: String, value: Double) {
-        // Nothing
-    }
-
-    override fun putFloat(key: String, value: Float) {
-        // Nothing
-    }
-
-    override fun putInt(key: String, value: Int) {
-        // Nothing
-    }
-
-    override fun putLong(key: String, value: Long) {
-        // Nothing
-    }
-
-    override fun putString(key: String, value: String) {
-        // Nothing
-    }
-
-    override fun remove(key: String) {
-        // Nothing
-    }
-
-}

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

@@ -2,8 +2,8 @@ package bou.amine.apps.readerforselfossv2.service
 
 import com.russhwolf.settings.Settings
 
-class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
+class AppSettingsService {
-    val settings: Settings = if (acraSenderServiceProcess) { ACRASettings() } else { Settings() }
+    val settings: Settings = Settings()
 
     // Api related
     private var _apiVersion: Int = -1