Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 651ab9c5 authored by Arnau Mora's avatar Arnau Mora Committed by GitHub
Browse files

Fixed empty translators.json (#401) 



* Update translators.json

* Added JSON parsing try-catch

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

* Log complete exception

---------

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>
Co-authored-by: default avatarRicki Hirner <hirner@bitfire.at>
parent bc7a3209

app/src/main/assets/translators.json

+1 −0
Original line number Diff line number Diff line 
{"ar_SA":["abdunnasir"],"bg":["dpa_transifex"],"ca":["Kintu","jordibrus","zagur"],"cs":["pavelb","tomas.odehnal"],"da":["Tntdruid_","knutztar","mjjzf","twikedk"],"de":["Atalanttore","TheName","Wyrrrd","YvanM","amandablue","anestiskaci","corppneq","crit12","hammaschlach","maxkl","nicolas_git","owncube"],"el":["KristinaQejvanaj","anestiskaci","diamond_gr"],"es":["Ark74","Elhea","GranPC","aluaces","jcvielma","plaguna","polkhas","xphnx"],"eu":["Osoitz","Thadah","cockeredradiation"],"fa":["Numb","ahangarha","amiraliakbari","joojoojoo","maryambehzi","mtashackori","taranehsaei"],"fr":["AlainR","Amadeen","Floflr","Llorc","LoiX07","Novick","Poussinou","Thecross","YvanM","alkino2","boutil","callmemagnus","chfo","chrcha","grenatrad","jokx","mathieugfortin","paullbn","vincen","ÉricB."],"fr_FR":["Llorc","Poussinou","chrcha"],"gl":["aluaces","pikamoku"],"hu":["Roshek","jtg"],"it":["Damtux","FranzMari","ed0","malaerba","noccio","nwandy","rickyroo","technezio"],"it_IT":["malaerba"],"ja":["Naofumi","yanorei32"],"nb_NO":["elonus"],"nl":["XtremeNova","davtemp","dehart","erikhubers","frankyboy1963","toonvangerwen"],"pl":["TORminator","TheName","Valdnet","gsz","mg6","oskarjakiela"],"pt":["amalvarenga","wanderlei.huttel"],"pt_BR":["wanderlei.huttel"],"ru":["aigoshin","anm","astalavister","nick.savin","vaddd"],"sk_SK":["brango67","tiborepcek"],"sl_SI":["MrLaaky","uroszor"],"sr":["daimonion"],"sv":["Mikaelb","campbelldavid"],"szl":["chlodny"],"tr_TR":["ooguz","pultars"],"uk":["androsua","olexn","twixi007"],"uk_UA":["astalavister"],"zh_CN":["anolir","jxj2zzz79pfp9bpo","linuxbckp","mofitt2016","oksjd","phy","spice2wolf"],"zh_TW":["linuxbckp","mofitt2016","phy","waiabsfabuloushk"]}

app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt

+24 −17
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import at.bitfire.davdroid.databinding.AboutBinding 
import at.bitfire.davdroid.databinding.AboutLanguagesBinding

import at.bitfire.davdroid.databinding.AboutTranslationBinding

import at.bitfire.davdroid.databinding.ActivityAboutBinding

import at.bitfire.davdroid.log.Logger

import com.google.accompanist.themeadapter.material.MdcTheme

import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer

import dagger.BindsOptionalOf
@@ -45,10 +46,12 @@ import dagger.hilt.android.components.ActivityComponent 
import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.launch

import org.apache.commons.io.IOUtils

import org.json.JSONException

import org.json.JSONObject

import java.text.Collator

import java.text.SimpleDateFormat

import java.util.*

import java.util.logging.Level

import javax.inject.Inject

import javax.inject.Qualifier
@@ -280,6 +283,7 @@ class AboutActivity: AppCompatActivity() { 
        val translations = object: MediatorLiveData<List<Translation>>() {

            init {

                addSource(plainText) { rawJson ->

                    try {

                        // parse JSON

                        val jsonTranslations = JSONObject(rawJson)

                        val result = LinkedList<Translation>()
@@ -301,6 +305,9 @@ class AboutActivity: AppCompatActivity() { 
                        }



                        postValue(result)

                    } catch (e: JSONException) {

                        Logger.log.log(Level.SEVERE, "Could not parse translators JSON", e)

                    }

                }

            }

        }