mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-23 13:35:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3474 from nextcloud/bugfix/3472/translateNoProxy

Browse source 
translate "no proxy" in settings
This commit is contained in:
Marcel Hibbe 2023-11-29 11:43:49 +01:00 committed by GitHub
commit 83a3d391ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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()
} else {
showProxySettings()
@ -987,7 +989,7 @@ class SettingsActivity : BaseActivity() {
proxyTypeFlow.collect { newString ->
if (newString != state) {
state = newString
if (("No proxy" == newString) || newString.isEmpty()) {
if (((context.resources.getString(R.string.nc_no_proxy)) == newString) || newString.isEmpty()) {
hideProxySettings()
} else {
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 {
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> {