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

Fix issues with settings

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-10-26 08:14:27 +02:00
parent 410f2cc597
commit b049f32044
1 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
View File

@ -61,6 +61,7 @@ import com.nextcloud.talk.jobs.AccountRemovalWorker
import com.nextcloud.talk.models.RingtoneSettings import com.nextcloud.talk.models.RingtoneSettings
import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.database.UserEntity
import com.nextcloud.talk.models.json.userprofile.UserProfileOverall import com.nextcloud.talk.models.json.userprofile.UserProfileOverall
import com.nextcloud.talk.newarch.utils.getCredentials
import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.utils.DoNotDisturbUtils import com.nextcloud.talk.utils.DoNotDisturbUtils
@ -85,6 +86,7 @@ import io.reactivex.schedulers.Schedulers
import net.orange_box.storebox.listeners.OnPreferenceValueChangedListener import net.orange_box.storebox.listeners.OnPreferenceValueChangedListener
import org.koin.android.ext.android.inject import org.koin.android.ext.android.inject
import java.io.IOException import java.io.IOException
import java.net.Proxy
import java.net.URI import java.net.URI
import java.net.URISyntaxException import java.net.URISyntaxException
import java.util.ArrayList import java.util.ArrayList
@ -178,12 +180,12 @@ class SettingsController : BaseController() {
private var saveStateHandler: LovelySaveStateHandler? = null private var saveStateHandler: LovelySaveStateHandler? = null
private var currentUser: UserEntity? = null private var currentUser: UserEntity? = null
private var credentials: String? = null private var credentials: String? = null
private var proxyTypeChangeListener: OnPreferenceValueChangedListener<String>? = null lateinit var proxyTypeChangeListener: OnPreferenceValueChangedListener<String>
private var proxyCredentialsChangeListener: OnPreferenceValueChangedListener<Boolean>? = null lateinit var proxyCredentialsChangeListener: OnPreferenceValueChangedListener<Boolean>
private var screenSecurityChangeListener: OnPreferenceValueChangedListener<Boolean>? = null lateinit var screenSecurityChangeListener: OnPreferenceValueChangedListener<Boolean>
private var screenLockChangeListener: OnPreferenceValueChangedListener<Boolean>? = null lateinit var screenLockChangeListener: OnPreferenceValueChangedListener<Boolean>
private var screenLockTimeoutChangeListener: OnPreferenceValueChangedListener<String>? = null lateinit var screenLockTimeoutChangeListener: OnPreferenceValueChangedListener<String>
private var themeChangeListener: OnPreferenceValueChangedListener<String>? = null lateinit var themeChangeListener: OnPreferenceValueChangedListener<String>
override fun inflateView( override fun inflateView(
inflater: LayoutInflater, inflater: LayoutInflater,
@ -193,8 +195,8 @@ class SettingsController : BaseController() {
} }
private fun getCurrentUser() { private fun getCurrentUser() {
currentUser = userUtils!!.currentUser currentUser = userUtils.currentUser
credentials = ApiUtils.getCredentials(currentUser!!.username, currentUser!!.token) credentials = currentUser!!.getCredentials()
} }
override fun onViewBound(view: View) { override fun onViewBound(view: View) {
@ -212,20 +214,18 @@ class SettingsController : BaseController() {
saveStateHandler = LovelySaveStateHandler() saveStateHandler = LovelySaveStateHandler()
} }
appPreferences!!.registerProxyTypeListener( proxyTypeChangeListener = ProxyTypeChangeListener()
ProxyTypeChangeListener() proxyCredentialsChangeListener = ProxyCredentialsChangeListener()
) screenSecurityChangeListener = ScreenSecurityChangeListener()
appPreferences!!.registerProxyCredentialsListener( screenLockChangeListener = ScreenLockListener()
ProxyCredentialsChangeListener() screenLockTimeoutChangeListener = ScreenLockTimeoutListener()
) themeChangeListener = ThemeChangeListener()
appPreferences!!.registerScreenSecurityListener( appPreferences.registerProxyTypeListener(proxyTypeChangeListener)
ScreenSecurityChangeListener() appPreferences.registerProxyCredentialsListener { proxyCredentialsChangeListener }
) appPreferences.registerScreenSecurityListener { screenSecurityChangeListener }
appPreferences!!.registerScreenLockListener(ScreenLockListener()) appPreferences.registerScreenLockListener { screenLockChangeListener }
appPreferences!!.registerScreenLockTimeoutListener( appPreferences.registerScreenLockTimeoutListener { screenLockTimeoutChangeListener }
ScreenLockTimeoutListener() appPreferences.registerThemeChangeListener { themeChangeListener }
)
appPreferences!!.registerThemeChangeListener(ThemeChangeListener())
val listWithIntFields = ArrayList<String>() val listWithIntFields = ArrayList<String>()
listWithIntFields.add("proxy_port") listWithIntFields.add("proxy_port")
@ -358,7 +358,7 @@ class SettingsController : BaseController() {
realAlias = "" realAlias = ""
} }
userUtils!!.createOrUpdateUser( userUtils.createOrUpdateUser(
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
currentUser!!.id, null, realAlias, null currentUser!!.id, null, realAlias, null
) )
@ -713,23 +713,21 @@ class SettingsController : BaseController() {
} }
public override fun onDestroy() { public override fun onDestroy() {
if (appPreferences != null) { appPreferences.unregisterProxyTypeListener(proxyTypeChangeListener)
appPreferences!!.unregisterProxyTypeListener(proxyTypeChangeListener) appPreferences.unregisterProxyCredentialsListener(proxyCredentialsChangeListener)
appPreferences!!.unregisterProxyCredentialsListener(proxyCredentialsChangeListener) appPreferences.unregisterScreenSecurityListener(screenSecurityChangeListener)
appPreferences!!.unregisterScreenSecurityListener(screenSecurityChangeListener) appPreferences.unregisterScreenLockListener(screenLockChangeListener)
appPreferences!!.unregisterScreenLockListener(screenLockChangeListener) appPreferences.unregisterScreenLockTimeoutListener(screenLockTimeoutChangeListener)
appPreferences!!.unregisterScreenLockTimeoutListener(screenLockTimeoutChangeListener) appPreferences.unregisterThemeChangeListener(themeChangeListener)
appPreferences!!.unregisterThemeChangeListener(themeChangeListener)
}
super.onDestroy() super.onDestroy()
} }
private fun hideProxySettings() { private fun hideProxySettings() {
appPreferences!!.removeProxyHost() appPreferences.removeProxyHost()
appPreferences!!.removeProxyPort() appPreferences.removeProxyPort()
appPreferences!!.removeProxyCredentials() appPreferences.removeProxyCredentials()
appPreferences!!.removeProxyUsername() appPreferences.removeProxyUsername()
appPreferences!!.removeProxyPassword() appPreferences.removeProxyPassword()
settingsScreen!!.findViewById<View>(R.id.settings_proxy_host_edit) settingsScreen!!.findViewById<View>(R.id.settings_proxy_host_edit)
.visibility = View.GONE .visibility = View.GONE
settingsScreen!!.findViewById<View>(R.id.settings_proxy_port_edit) settingsScreen!!.findViewById<View>(R.id.settings_proxy_port_edit)
@ -775,7 +773,7 @@ class SettingsController : BaseController() {
override fun onChanged(newValue: String) { override fun onChanged(newValue: String) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
SecurityUtils.createKey(appPreferences!!.screenLockTimeout) SecurityUtils.createKey(appPreferences.screenLockTimeout)
} }
} }
} }