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

remove remaining traces of lovelyDialog from settings controller

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-08-15 20:37:11 +02:00
parent 6418e3262c
commit c13b01da33
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,6 @@ import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew
import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
import com.nextcloud.talk.utils.preferences.MagicUserInputModule import com.nextcloud.talk.utils.preferences.MagicUserInputModule
import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder
import com.yarolegovich.lovelydialog.LovelySaveStateHandler
import io.reactivex.Observer import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
@ -364,12 +363,6 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
) )
} }
private fun showLovelyDialog(dialogId: Int, savedInstanceState: Bundle?) {
if (dialogId == ID_REMOVE_ACCOUNT_WARNING_DIALOG) {
showRemoveAccountWarning(savedInstanceState)
}
}
fun sendLogs() { fun sendLogs() {
if (resources!!.getBoolean(R.bool.nc_is_debug)) { if (resources!!.getBoolean(R.bool.nc_is_debug)) {
sendMailWithAttachment((context)!!) sendMailWithAttachment((context)!!)
@ -378,14 +371,9 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
override fun onRestoreViewState(view: View, savedViewState: Bundle) { override fun onRestoreViewState(view: View, savedViewState: Bundle) {
super.onRestoreViewState(view, savedViewState) super.onRestoreViewState(view, savedViewState)
if (LovelySaveStateHandler.wasDialogOnScreen(savedViewState)) {
// Dialog won't be restarted automatically, so we need to call this method.
// Each dialog knows how to restore its state
showLovelyDialog(LovelySaveStateHandler.getSavedDialogId(savedViewState), savedViewState)
}
} }
private fun showRemoveAccountWarning(savedInstanceState: Bundle?) { private fun showRemoveAccountWarning() {
if (activity != null) { if (activity != null) {
val materialAlertDialogBuilder = MaterialAlertDialogBuilder(binding.messageText.context) val materialAlertDialogBuilder = MaterialAlertDialogBuilder(binding.messageText.context)
.setTitle(R.string.nc_settings_remove_account) .setTitle(R.string.nc_settings_remove_account)
@ -492,7 +480,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
setupProfileQueryDisposable() setupProfileQueryDisposable()
binding.settingsRemoveAccount.addPreferenceClickListener { binding.settingsRemoveAccount.addPreferenceClickListener {
showLovelyDialog(ID_REMOVE_ACCOUNT_WARNING_DIALOG, null) showRemoveAccountWarning()
} }
} }
setupMessageView() setupMessageView()
@ -1067,7 +1055,6 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
companion object { companion object {
private const val TAG = "SettingsController" private const val TAG = "SettingsController"
private const val ID_REMOVE_ACCOUNT_WARNING_DIALOG = 0
private const val DURATION: Long = 2500 private const val DURATION: Long = 2500
private const val START_DELAY: Long = 5000 private const val START_DELAY: Long = 5000
private const val DISABLED_ALPHA: Float = 0.38f private const val DISABLED_ALPHA: Float = 0.38f