gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

translate "no proxy" in settings

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-11-29 11:07:57 +01:00
parent 5f53005556
commit f6b481cea8
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
View File

@ -587,7 +587,9 @@ class SettingsActivity : BaseActivity() {
} }
} }
if (("No proxy" == appPreferences.proxyType) || appPreferences.proxyType == null) { if (((context.resources.getString(R.string.nc_no_proxy)) == appPreferences.proxyType) ||
appPreferences.proxyType == null
) {
hideProxySettings() hideProxySettings()
} else { } else {
showProxySettings() showProxySettings()
@ -987,7 +989,7 @@ class SettingsActivity : BaseActivity() {
proxyTypeFlow.collect { newString -> proxyTypeFlow.collect { newString ->
if (newString != state) { if (newString != state) {
state = newString state = newString
if (("No proxy" == newString) || newString.isEmpty()) { if (((context.resources.getString(R.string.nc_no_proxy)) == newString) || newString.isEmpty()) {
hideProxySettings() hideProxySettings()
} else { } else {
when (newString) { when (newString) {

4
app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt
View File

@ -41,7 +41,9 @@ import kotlinx.coroutines.runBlocking
class AppPreferencesImpl(val context: Context) : AppPreferences { class AppPreferencesImpl(val context: Context) : AppPreferences {
override fun getProxyType(): String { override fun getProxyType(): String {
return runBlocking { async { readString(PROXY_TYPE, "No proxy").first() } }.getCompleted() return runBlocking {
async { readString(PROXY_TYPE, context.resources.getString(R.string.nc_no_proxy)).first() }
}.getCompleted()
} }
override fun setProxyType(proxyType: String?) = runBlocking<Unit> { override fun setProxyType(proxyType: String?) = runBlocking<Unit> {