Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 42bd1e84 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Don't cancel service detection when DetectConfigurationFragment's view model... 

Don't cancel service detection when DetectConfigurationFragment's view model is cleared (bitfireAT/davx5#442)

- Rewrite DetectConfigurationFragment to Compose
- Use coroutines and runInterruptible instead of Thread
- Only cancel service detection when back is pressed
parent 46615a83

app/src/main/kotlin/at/bitfire/davdroid/servicedetection/DavResourceFinder.kt

+7 −2
Original line number Diff line number Diff line
@@ -78,8 +78,13 @@ class DavResourceFinder( 




    /**

     * Finds the initial configuration, i.e. runs the auto-detection process. Must not throw an

     * exception, but return an empty Configuration with error logs instead.

     * Finds the initial configuration (= runs the service detection process).

     *

     * In case of an error, it returns an empty [Configuration] with error logs

     * instead of throwing an [Exception].

     *

     * @return service information – if there's neither a CalDAV service nor a CardDAV service,

     * service detection was not successful

     */

    fun findInitialConfiguration(): Configuration {

        var cardDavConfig: Configuration.ServiceInfo? = null

app/src/main/kotlin/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt

+95 −36
Original line number Diff line number Diff line
@@ -8,25 +8,42 @@ import android.app.Application 
import android.app.Dialog

import android.os.Bundle

import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import androidx.activity.compose.BackHandler

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.padding

import androidx.compose.material.LinearProgressIndicator

import androidx.compose.material.MaterialTheme

import androidx.compose.material.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.platform.ComposeView

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.unit.dp

import androidx.fragment.app.DialogFragment

import androidx.fragment.app.Fragment

import androidx.fragment.app.activityViewModels

import androidx.fragment.app.viewModels

import androidx.lifecycle.AndroidViewModel

import androidx.lifecycle.LiveData

import androidx.lifecycle.MutableLiveData

import at.bitfire.davdroid.R

import at.bitfire.davdroid.db.Credentials

import at.bitfire.davdroid.log.Logger

import at.bitfire.davdroid.servicedetection.DavResourceFinder

import at.bitfire.davdroid.ui.DebugInfoActivity

import com.google.accompanist.themeadapter.material.MdcTheme

import com.google.android.material.dialog.MaterialAlertDialogBuilder

import java.lang.ref.WeakReference

import kotlinx.coroutines.CoroutineName

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.MainScope

import kotlinx.coroutines.cancel

import kotlinx.coroutines.launch

import kotlinx.coroutines.plus

import kotlinx.coroutines.runInterruptible

import java.net.URI

import java.util.logging.Level

import kotlin.concurrent.thread



class DetectConfigurationFragment: Fragment() {
@@ -39,7 +56,7 @@ class DetectConfigurationFragment: Fragment() { 


        val baseURI = loginModel.baseURI ?: return



        model.detectConfiguration(baseURI, loginModel.credentials).observe(this) { result ->

        model.result.observe(this) { result ->

            // save result for next step

            loginModel.configuration = result
@@ -56,50 +73,64 @@ class DetectConfigurationFragment: Fragment() { 
                        .add(NothingDetectedFragment(), null)

                        .commit()

        }

    }



    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =

            inflater.inflate(R.layout.detect_configuration, container, false)!!



        model.start(baseURI, loginModel.credentials)

    }



    class DetectConfigurationModel(application: Application): AndroidViewModel(application) {

    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) =

        ComposeView(requireContext()).apply {

            setContent {

                MdcTheme {

                    DetectConfigurationView()

                }



        private var detectionThread: WeakReference<Thread>? = null

        private var result = MutableLiveData<DavResourceFinder.Configuration>()

                // Cancel service detection only when back button is pressed

                BackHandler {

                    model.cancel()



        fun detectConfiguration(baseURI: URI, credentials: Credentials?): LiveData<DavResourceFinder.Configuration> {

            synchronized(result) {

                if (detectionThread != null)

                    // detection already running

                    return result

                    parentFragmentManager.popBackStack()

                }

            }



            thread {

                synchronized(result) {

                    detectionThread = WeakReference(Thread.currentThread())

        }





    class DetectConfigurationModel(application: Application): AndroidViewModel(application) {



        val scope = MainScope() + CoroutineName("DetectConfigurationModel")

        var result = MutableLiveData<DavResourceFinder.Configuration>()



        /**

         * Starts service detection in a global scope which is independent of the ViewModel scope so

         * that service detection won't be cancelled when the user for instance switches to another app.

         *

         * The service detection result will be posted into [result].

         */

        fun start(baseURI: URI, credentials: Credentials?) {

            scope.launch(Dispatchers.Default) {

                runInterruptible {

                    try {

                        DavResourceFinder(getApplication(), baseURI, credentials).use { finder ->

                        result.postValue(finder.findInitialConfiguration())

                            val configuration = finder.findInitialConfiguration()

                            result.postValue(configuration)

                        }

                    } catch(e: Exception) {

                    // exception, shouldn't happen

                    Logger.log.log(Level.SEVERE, "Internal resource detection error", e)

                        // This shouldn't happen; instead configuration should be empty

                        at.bitfire.davdroid.log.Logger.log.log(Level.WARNING, "Uncaught exception during service detection, shouldn't happen", e)

                    }

                }

            }

            return result

        }



        override fun onCleared() {

            synchronized(result) {

                detectionThread?.get()?.let { thread ->

        /**

         * Cancels a potentially running service detection.

         */

        fun cancel() {

            Logger.log.info("Aborting resource detection")

                    thread.interrupt()

                }

                detectionThread = null

            }

            try {

                scope.cancel()

            } catch (ignored: IllegalStateException) { }

        }



    }
@@ -131,3 +162,31 @@ class DetectConfigurationFragment: Fragment() { 
    }



}





@Composable

fun DetectConfigurationView() {

    Column(Modifier

        .fillMaxWidth()

        .padding(8.dp)) {

        Text(

            stringResource(R.string.login_configuration_detection),

            style = MaterialTheme.typography.h5

        )

        LinearProgressIndicator(

            color = MaterialTheme.colors.secondary,

            modifier = Modifier

                .fillMaxWidth()

                .padding(top = 8.dp, bottom = 16.dp))

        Text(

            stringResource(R.string.login_querying_server),

            style = MaterialTheme.typography.body1

        )

    }

}



@Composable

@Preview

fun DetectConfigurationView_Preview() {

    DetectConfigurationView()

}
 
 No newline at end of file

app/src/main/res/layout/detect_configuration.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:layout_margin="@dimen/activity_margin">



    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dp"

        style="@style/TextAppearance.MaterialComponents.Headline5"

        android:text="@string/login_configuration_detection"/>



    <ProgressBar

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:indeterminate="true"

        style="@style/Widget.AppCompat.ProgressBar.Horizontal"/>



    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dp"

        android:text="@string/login_querying_server"

        style="@style/TextAppearance.AppCompat.Medium"/>





</LinearLayout>