arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-06-02 22:29:05 +00:00
Code Issues Releases Wiki Activity

DetectConfigurationFragment: use async task instead of loader.

Browse Source 
It's cleaner, but it should also hopefully fix issues with some Android
devices killing the worker thread.
This commit is contained in:
Tom Hacohen 2020-10-30 12:52:51 +02:00
parent b56b03060d
commit cea216e6f7
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.kt
View File

@ -23,8 +23,10 @@ import com.etesync.syncadapter.R
import com.etesync.syncadapter.log.Logger import com.etesync.syncadapter.log.Logger
import com.etesync.syncadapter.ui.DebugInfoActivity import com.etesync.syncadapter.ui.DebugInfoActivity
import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.uiThread
class DetectConfigurationFragment : DialogFragment(), LoaderManager.LoaderCallbacks<Configuration> { class DetectConfigurationFragment : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val progress = ProgressDialog(activity) val progress = ProgressDialog(activity)
@ -40,14 +42,22 @@ class DetectConfigurationFragment : DialogFragment(), LoaderManager.LoaderCallba
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
Logger.log.fine("DetectConfigurationFragment: loading") Logger.log.fine("DetectConfigurationFragment: loading")
loaderManager.initLoader(0, arguments, this)
if (savedInstanceState == null) {
findConfiguration(requireArguments().getParcelable(ARG_LOGIN_CREDENTIALS)!!)
}
} }
override fun onCreateLoader(id: Int, args: Bundle?): Loader<Configuration> { private fun findConfiguration(credentials: LoginCredentials) {
return ServerConfigurationLoader(requireContext(), args!!.getParcelable(ARG_LOGIN_CREDENTIALS) as LoginCredentials) doAsync {
val data = BaseConfigurationFinder(requireContext(), credentials).findInitialConfiguration()
uiThread {
onLoadFinished(data)
}
}
} }
override fun onLoadFinished(loader: Loader<Configuration>, data: Configuration?) { private fun onLoadFinished(data: Configuration?) {
if (data != null) { if (data != null) {
if (data.isFailed) { if (data.isFailed) {
Logger.log.warning("Failed login configuration ${data.error?.localizedMessage}") Logger.log.warning("Failed login configuration ${data.error?.localizedMessage}")
@ -75,13 +85,10 @@ class DetectConfigurationFragment : DialogFragment(), LoaderManager.LoaderCallba
dismissAllowingStateLoss() dismissAllowingStateLoss()
} }
override fun onLoaderReset(loader: Loader<Configuration>) {}
class NothingDetectedFragment : DialogFragment() { class NothingDetectedFragment : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
return AlertDialog.Builder(activity!!) return AlertDialog.Builder(requireActivity())
.setTitle(R.string.setting_up_encryption) .setTitle(R.string.setting_up_encryption)
.setIcon(R.drawable.ic_error_dark) .setIcon(R.drawable.ic_error_dark)
.setMessage(requireArguments().getString(KEY_LOGS)) .setMessage(requireArguments().getString(KEY_LOGS))
@ -104,17 +111,6 @@ class DetectConfigurationFragment : DialogFragment(), LoaderManager.LoaderCallba
} }
} }
internal class ServerConfigurationLoader(context: Context, val credentials: LoginCredentials) : AsyncTaskLoader<Configuration>(context) {
override fun onStartLoading() {
forceLoad()
}
override fun loadInBackground(): Configuration? {
return BaseConfigurationFinder(context, credentials).findInitialConfiguration()
}
}
companion object { companion object {
protected val ARG_LOGIN_CREDENTIALS = "credentials" protected val ARG_LOGIN_CREDENTIALS = "credentials"