From 8586014e17bae652b16f084e1a1e18c77b2ad4b1 Mon Sep 17 00:00:00 2001 From: len Date: Fri, 8 Sep 2017 17:43:46 +0200 Subject: [PATCH] Exclude extensions dependencies from proguard. Enable new translations. --- app/proguard-rules.pro | 3 +++ .../kanade/tachiyomi/ui/setting/SettingsGeneralController.kt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 1ac898d6a8..fa96102395 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -10,6 +10,9 @@ # Extensions may require methods unused in the core app -keep class org.jsoup.** { *; } -keep class kotlin.** { *; } +-keep class okhttp3.** { *; } +-keep class com.google.gson.** { *; } +-keep class com.github.salomonbrys.kotson.** { *; } # OkHttp -dontwarn okhttp3.** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index 5a755b4a69..8719f746df 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -29,8 +29,8 @@ class SettingsGeneralController : SettingsController() { listPreference { key = Keys.lang titleRes = R.string.pref_language - entryValues = arrayOf("", "bg", "en", "es", "fr", "it", "lv", "nl", "pt", "pt-BR", "ru", - "vi") + entryValues = arrayOf("", "bg", "de", "en", "es", "fr", "it", "lv", "nl", "pl", "pt", + "pt-BR", "ru", "vi") entries = entryValues.map { value -> val locale = LocaleHelper.getLocaleFromString(value.toString()) locale?.getDisplayName(locale)?.capitalize() ?: