Still fixing selfoss version issues.

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Galician)

* New translations strings.xml (Spanish)

* New translations strings.xml (Galician)

CHANGELOG.md

@@ -1,5 +1,7 @@
 **1.7.x**
 
+- Closes #216. Issue with selfoss version 2.19.
+
 - Closes #179. Sync of read/unread/star/unstar items on background task or on app reload with network available.
 
 - Closes #33. Background sync with settings.

app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt

@@ -248,7 +248,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         badgeNew--
                         reloadBadgeContent()
 
-                        val tagHashes = i.tags.split(",").map { it.longHash() }
+                        val tagHashes = i.tags.tags.split(",").map { it.longHash() }
                         tagsBadge = tagsBadge.map {
                             if (tagHashes.contains(it.key)) {
                                 (it.key to (it.value - 1))
@@ -367,7 +367,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 thread {
                     if (response.body() != null) {
                         val apiItems = (response.body() as ArrayList<Item>).filter {
-                            maybeTagFilter != null || filter(it.tags)
+                            maybeTagFilter != null || filter(it.tags.tags)
                         } as ArrayList<Item>
                         db.itemsDao().deleteAllItems()
                         db.itemsDao()
@@ -735,6 +735,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         }
 
                         override fun onFailure(call: Call<List<Source>>?, t: Throwable?) {
+                            val apiDrawerData = DrawerData(tags, null)
+                            if ((maybeDrawerData != null && maybeDrawerData != apiDrawerData) || maybeDrawerData == null) {
+                                handleDrawerData(apiDrawerData)
+                            }
                         }
                     })
                 }
@@ -999,7 +1003,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                     getAndStoreAllItems()
                     items = response.body() as ArrayList<Item>
                     items = items.filter {
-                        maybeTagFilter != null || filter(it.tags)
+                        maybeTagFilter != null || filter(it.tags.tags)
                     } as ArrayList<Item>
 
                     if (allItems.isEmpty()) {
@@ -1299,7 +1303,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         val ids = allItems.map { it.id }
                         val itemsByTag: Map<Long, Int> =
                             allItems.flattenTags()
-                                .groupBy { it.tags.longHash() }
+                                .groupBy { it.tags.tags.longHash() }
                                 .map { it.key to it.value.size }
                                 .toMap()
 

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt

@@ -66,6 +66,7 @@ class SelfossApi(
         val gson =
             GsonBuilder()
                 .registerTypeAdapter(Boolean::class.javaPrimitiveType, BooleanTypeAdapter())
+                .registerTypeAdapter(SelfossTagType::class.java, SelfossTagTypeTypeAdapter())
                 .setLenient()
                 .create()
 

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt

@@ -45,7 +45,7 @@ data class Spout(
 data class Source(
     @SerializedName("id") val id: String,
     @SerializedName("title") val title: String,
-    @SerializedName("tags") val tags: String,
+    @SerializedName("tags") val tags: SelfossTagType,
     @SerializedName("spout") val spout: String,
     @SerializedName("error") val error: String,
     @SerializedName("icon") val icon: String
@@ -71,7 +71,7 @@ data class Item(
     @SerializedName("icon") val icon: String,
     @SerializedName("link") val link: String,
     @SerializedName("sourcetitle") val sourcetitle: String,
-    @SerializedName("tags") val tags: String
+    @SerializedName("tags") val tags: SelfossTagType
 ) : Parcelable {
 
     var config: Config? = null
@@ -94,7 +94,7 @@ data class Item(
         icon = source.readString(),
         link = source.readString(),
         sourcetitle = source.readString(),
-        tags = source.readString()
+        tags = source.readParcelable(ClassLoader.getSystemClassLoader())
     )
 
     override fun describeContents() = 0
@@ -110,7 +110,7 @@ data class Item(
         dest.writeString(icon)
         dest.writeString(link)
         dest.writeString(sourcetitle)
-        dest.writeString(tags)
+        dest.writeParcelable(tags, flags)
     }
 
     fun getIcon(app: Context): String {
@@ -153,4 +153,27 @@ data class Item(
 
         return stringUrl
     }
+}
+
+data class SelfossTagType(val tags: String) : Parcelable {
+
+    companion object {
+        @JvmField val CREATOR: Parcelable.Creator<SelfossTagType> =
+            object : Parcelable.Creator<SelfossTagType> {
+                override fun createFromParcel(source: Parcel): SelfossTagType =
+                    SelfossTagType(source)
+
+                override fun newArray(size: Int): Array<SelfossTagType?> = arrayOfNulls(size)
+            }
+    }
+
+    constructor(source: Parcel) : this(
+        tags = source.readString()
+    )
+
+    override fun describeContents() = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(tags)
+    }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossTagTypeTypeAdapter.kt

@@ -0,0 +1,22 @@
+package apps.amine.bou.readerforselfoss.api.selfoss
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import java.lang.reflect.Type
+
+internal class SelfossTagTypeTypeAdapter : JsonDeserializer<SelfossTagType> {
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): SelfossTagType? =
+        if (json.isJsonArray) {
+            SelfossTagType(json.asJsonArray.joinToString(",") { it.toString() })
+        } else {
+            SelfossTagType(json.toString())
+        }
+}

app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt

@@ -3,6 +3,7 @@ package apps.amine.bou.readerforselfoss.utils
 import android.content.Context
 import android.text.format.DateUtils
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
+import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
 import org.acra.ACRA
 import java.text.ParseException
 import java.text.SimpleDateFormat
@@ -44,8 +45,8 @@ fun Item.toggleStar(): Item {
 fun List<Item>.flattenTags(): List<Item> =
     this.flatMap {
         val item = it
-        val tags: List<String> = it.tags.split(",")
+        val tags: List<String> = it.tags.tags.split(",")
-        tags.map {
+        tags.map { t ->
-            item.copy(tags = it.trim())
+            item.copy(tags = SelfossTagType(t.trim()))
         }
     }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/persistence/EntitiesUtils.kt

@@ -1,6 +1,7 @@
 package apps.amine.bou.readerforselfoss.utils.persistence
 
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
+import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
 import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.api.selfoss.Tag
 import apps.amine.bou.readerforselfoss.persistence.entities.ItemEntity
@@ -18,7 +19,7 @@ fun SourceEntity.toView(): Source =
         Source(
             this.id,
             this.title,
-            this.tags,
+            SelfossTagType(this.tags),
             this.spout,
             this.error,
             this.icon
@@ -28,7 +29,7 @@ fun Source.toEntity(): SourceEntity =
         SourceEntity(
             this.id,
             this.title,
-            this.tags,
+            this.tags.tags,
             this.spout,
             this.error,
             this.icon.orEmpty()
@@ -53,7 +54,7 @@ fun ItemEntity.toView(): Item =
             this.icon,
             this.link,
             this.sourcetitle,
-            this.tags
+            SelfossTagType(this.tags)
         )
 
 fun Item.toEntity(): ItemEntity =
@@ -68,5 +69,5 @@ fun Item.toEntity(): ItemEntity =
         this.icon,
         this.link,
         this.sourcetitle,
-        this.tags
+        this.tags.tags
     )

app/src/main/res/values-es-rES/strings.xml

@@ -153,12 +153,12 @@
     <string name="pref_switch_items_caching_on">Los artículos se guardarán en la memoria del dispositivo y se utilizarán para el uso sin conexión.</string>
     <string name="pref_switch_items_caching">Guardar elementos para uso sin conexión</string>
     <string name="no_network_connectivity">Sin conexión!</string>
-    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh">Sincronizar artículos</string>
-    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_off">Los artículos no se sincronizarán en segundo plano</string>
-    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_switch_periodic_refresh_on">Los artículos se sincronizarán periódicamente</string>
-    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
-    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="pref_switch_refresh_when_charging">Sólo refrescar cuando el teléfono está cargando</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Cargando...</string>
-    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="loading_notification_text">Selfoss está sincronizando tus artículos</string>
-    <string name="notification_channel_sync">Sync notification</string>
+    <string name="notification_channel_sync">Notificación de sincronización</string>
 </resources>

app/src/main/res/values-gl-rES/strings.xml

@@ -153,12 +153,12 @@
     <string name="pref_switch_items_caching_on">Os artigos gardaranse na memoria do dispositivo e estarán dispoñibles sen conexión.</string>
     <string name="pref_switch_items_caching">Gardar elementos para uso sen conexión</string>
     <string name="no_network_connectivity">Non conectado!</string>
-    <string name="pref_switch_periodic_refresh">Sync articles</string>
+    <string name="pref_switch_periodic_refresh">Sincronizar artigos</string>
-    <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
+    <string name="pref_switch_periodic_refresh_off">Os artigos non se sincronizarán coa aplicación de fondo</string>
-    <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
+    <string name="pref_switch_periodic_refresh_on">Os artigos sincronizaranse periódicamente</string>
-    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
+    <string name="pref_periodic_refresh_minutes_title"><![CDATA[Intervalo de sincronización (>= 15 minutos)]]></string>
-    <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
+    <string name="pref_switch_refresh_when_charging">Só refrescar cando o teléfono se está a cargar</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">Cargando...</string>
-    <string name="loading_notification_text">Selfoss is syncing your articles</string>
+    <string name="loading_notification_text">Selfoss está sincronizando os teus ar tigos</string>
-    <string name="notification_channel_sync">Sync notification</string>
+    <string name="notification_channel_sync">Notificación de sincronización</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -137,13 +137,13 @@
     <string name="pref_switch_actions_pager_scroll">Mark as read on swipe</string>
     <string name="pref_switch_actions_pager_scroll_off">Don\'t mark articles as read when swiping.</string>
     <string name="gdpr_dialog_message">The app does not collect any personal data. Every analytics tools were removed. Crash reports sending is now optional, as is the debug logging. Keep in mind that debugging and crash reports are essential for the app development (You can configure everything in Settings &gt; Debug).</string>
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
+    <string name="gdpr_dialog_title">這應用程式不會分享你的任何個人資訊</string>
     <string name="crash_dialog_text">Something went wrong. Please send the report to the developer.</string>
     <string name="crash_dialog_comment">You can add any helpful details in the comment bellow. Don\'t include any personal data in your comment. You could send me and email with your debug id, and I\'ll keep you posted when the issue is resolved.</string>
-    <string name="pref_acra_alwaysaccept">Automatically send crash reports</string>
+    <string name="pref_acra_alwaysaccept">自动发送錯誤报告</string>
     <string name="pref_acra_alwaysaccept_enabled">Will send crash reports automatically</string>
     <string name="pref_acra_alwaysaccept_disabled">Will ask everytime when sending crash reports.</string>
-    <string name="pref_debug_crash_reports">Crash reports</string>
+    <string name="pref_debug_crash_reports">错误报告</string>
     <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
     <string name="acra_login">Enable logging</string>
     <string name="drawer_item_hidden_tags">Hidden Tags</string>
@@ -152,13 +152,13 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</string>
-    <string name="no_network_connectivity">Not connected !</string>
+    <string name="no_network_connectivity">未连接</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
     <string name="pref_switch_periodic_refresh_on">Articles will periodically be synced</string>
     <string name="pref_periodic_refresh_minutes_title"><![CDATA[Sync interval ( >= 15 minutes)]]></string>
     <string name="pref_switch_refresh_when_charging">Only refresh when phone is charging</string>
-    <string name="loading_notification_title">Loading ...</string>
+    <string name="loading_notification_title">加载中...</string>
     <string name="loading_notification_text">Selfoss is syncing your articles</string>
-    <string name="notification_channel_sync">Sync notification</string>
+    <string name="notification_channel_sync">同步通知</string>
 </resources>