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

Commit b6314aa9 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge branch 'v1.1-5673-reverting' into 'main' 

Revert commits to fix latest version issues

See merge request !72
parents 0cacbaa0 e2157f3a

app/src/main/java/foundation/e/privacycentralapp/domain/usecases/FakeLocationStateUseCase.kt

+8 −4
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ import android.location.Location 
import android.location.LocationListener

import android.location.LocationListener

import android.location.LocationManager

import android.location.LocationManager

import android.os.Bundle

import android.os.Bundle

import android.os.Looper

import android.util.Log

import android.util.Log

import foundation.e.privacycentralapp.data.repositories.LocalStateRepository

import foundation.e.privacycentralapp.data.repositories.LocalStateRepository

import foundation.e.privacycentralapp.domain.entities.LocationMode

import foundation.e.privacycentralapp.domain.entities.LocationMode
@@ -177,9 +176,14 @@ class FakeLocationStateUseCase( 
                LocationManager.NETWORK_PROVIDER, // TODO: tight this with fakelocation module.

                LocationManager.NETWORK_PROVIDER, // TODO: tight this with fakelocation module.

                0L,

                0L,

                0f,

                0f,

                listener,

                listener

                Looper.getMainLooper()

            )

            )

            // locationManager.requestLocationUpdates(

            //     LocationManager.NETWORK_PROVIDER, // TODO: tight this with fakelocation module.

            //     0L,

            //     0f,

            //     listener

            // )





            val location: Location? = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)

            val location: Location? = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)

            location?.let { listener.onLocationChanged(it) }

            location?.let { listener.onLocationChanged(it) }

flow-mvi/src/main/java/foundation/e/flowmvi/feature/BaseFeature.kt

+4 −7
Original line number Original line Diff line number Diff line
@@ -23,8 +23,6 @@ import foundation.e.flowmvi.MVIView 
import foundation.e.flowmvi.Reducer

import foundation.e.flowmvi.Reducer

import foundation.e.flowmvi.SingleEventProducer

import foundation.e.flowmvi.SingleEventProducer

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.Job

import kotlinx.coroutines.channels.Channel

import kotlinx.coroutines.channels.Channel

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.MutableStateFlow
@@ -105,12 +103,11 @@ open class BaseFeature<State : Any, in Action : Any, in Effect : Any, SingleEven 
    }

    }





    private suspend fun Flow<Action>.collectIntoHandler(

    private suspend fun Flow<Action>.collectIntoHandler(

        @Suppress("UNUSED_PARAMETER")callerCoroutineScope: CoroutineScope,

        callerCoroutineScope: CoroutineScope,

        @Suppress("UNUSED_PARAMETER") logger: Logger

        @Suppress("UNUSED_PARAMETER") logger: Logger

    ) {

    ) {

        val scope = CoroutineScope(Dispatchers.IO + Job())

        onEach { action ->

        onEach { action ->

            scope.launch {

            callerCoroutineScope.launch {

                actor.invoke(_state.value, action)

                actor.invoke(_state.value, action)

                    .onEach { effect ->

                    .onEach { effect ->

                        mutex.withLock {

                        mutex.withLock {
@@ -125,9 +122,9 @@ open class BaseFeature<State : Any, in Action : Any, in Effect : Any, SingleEven 
                            }

                            }

                        }

                        }

                    }

                    }

                    .launchIn(scope)

                    .launchIn(coroutineScope)

            }

            }

        }

        }

            .launchIn(scope)

            .launchIn(callerCoroutineScope)

    }

    }

}
 
}