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

Merge pull request #3364 from nextcloud/bug_fix_privacy_button_in_settings

Browse Source 
Small Bug fix - Privacy button in settings not working
This commit is contained in:
Andy Scherzinger 2023-10-05 19:53:47 +02:00 committed by GitHub
commit 691a66ef1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,6 @@ import androidx.work.OneTimeWorkRequest
import androidx.work.WorkInfo import androidx.work.WorkInfo
import androidx.work.WorkManager import androidx.work.WorkManager
import autodagger.AutoInjector import autodagger.AutoInjector
import com.afollestad.materialdialogs.utils.MDUtil.getStringArray
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
@ -104,6 +103,7 @@ import java.net.URISyntaxException
import java.util.Locale import java.util.Locale
import javax.inject.Inject import javax.inject.Inject
@Suppress("LargeClass", "TooManyFunctions")
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
class SettingsActivity : BaseActivity() { class SettingsActivity : BaseActivity() {
private lateinit var binding: ActivitySettingsBinding private lateinit var binding: ActivitySettingsBinding
@ -393,9 +393,11 @@ class SettingsActivity : BaseActivity() {
screenSecurityChangeListener = it screenSecurityChangeListener = it
} }
) )
var pos = getStringArray(R.array.screen_lock_timeout_entry_values).indexOf(appPreferences.screenLockTimeout) var pos = resources.getStringArray(R.array.screen_lock_timeout_entry_values).indexOf(
appPreferences.screenLockTimeout
)
binding.settingsScreenLockTimeoutLayoutDropdown.setText( binding.settingsScreenLockTimeoutLayoutDropdown.setText(
getStringArray(R.array.screen_lock_timeout_descriptions)[pos] resources.getStringArray(R.array.screen_lock_timeout_descriptions)[pos]
) )
binding.settingsScreenLockTimeoutLayoutDropdown.setSimpleItems(R.array.screen_lock_timeout_descriptions) binding.settingsScreenLockTimeoutLayoutDropdown.setSimpleItems(R.array.screen_lock_timeout_descriptions)
binding.settingsScreenLockTimeoutLayoutDropdown.setOnItemClickListener { _, _, position, _ -> binding.settingsScreenLockTimeoutLayoutDropdown.setOnItemClickListener { _, _, position, _ ->
@ -408,11 +410,11 @@ class SettingsActivity : BaseActivity() {
screenLockTimeoutChangeListener = it screenLockTimeoutChangeListener = it
} }
) )
pos = getStringArray(R.array.theme_entry_values).indexOf(appPreferences.theme) pos = resources.getStringArray(R.array.theme_entry_values).indexOf(appPreferences.theme)
binding.settingsTheme.setText(getStringArray(R.array.theme_descriptions)[pos]) binding.settingsTheme.setText(resources.getStringArray(R.array.theme_descriptions)[pos])
binding.settingsTheme.setSimpleItems(R.array.theme_descriptions) binding.settingsTheme.setSimpleItems(R.array.theme_descriptions)
binding.settingsTheme.setOnItemClickListener { _, _, position, _ -> binding.settingsTheme.setOnItemClickListener { _, _, position, _ ->
val entryVal: String = getStringArray(R.array.theme_entry_values)[position] val entryVal: String = resources.getStringArray(R.array.theme_entry_values)[position]
appPreferences.theme = entryVal appPreferences.theme = entryVal
} }
appPreferences.registerThemeChangeListener(ThemeChangeListener().also { themeChangeListener = it }) appPreferences.registerThemeChangeListener(ThemeChangeListener().also { themeChangeListener = it })
@ -426,9 +428,7 @@ class SettingsActivity : BaseActivity() {
readPrivacyChangeListener = it readPrivacyChangeListener = it
} }
) )
binding.settingsPrivacy.setOnClickListener {
readPrivacyChangeListener!!.onChanged(!binding.settingsReadPrivacySwitch.isChecked)
}
appPreferences.registerTypingStatusChangeListener( appPreferences.registerTypingStatusChangeListener(
TypingStatusChangeListener().also { TypingStatusChangeListener().also {
typingStatusChangeListener = it typingStatusChangeListener = it
@ -527,7 +527,7 @@ class SettingsActivity : BaseActivity() {
binding.settingsProxyChoice.setText(appPreferences.proxyType) binding.settingsProxyChoice.setText(appPreferences.proxyType)
binding.settingsProxyChoice.setSimpleItems(R.array.proxy_type_descriptions) binding.settingsProxyChoice.setSimpleItems(R.array.proxy_type_descriptions)
binding.settingsProxyChoice.setOnItemClickListener { _, _, position, _ -> binding.settingsProxyChoice.setOnItemClickListener { _, _, position, _ ->
val entryVal = getStringArray(R.array.proxy_type_descriptions)[position] val entryVal = resources.getStringArray(R.array.proxy_type_descriptions)[position]
appPreferences.proxyType = entryVal appPreferences.proxyType = entryVal
} }