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

Commit fdeecefd authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

PR suggestions, make apply Hide Ip clearer

parent 5f02fd14

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

+10 −4
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ package foundation.e.privacycentralapp.domain.usecases 
import foundation.e.privacycentralapp.data.repositories.AppListsRepository

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

import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode

import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode.HIDE_IP

import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode.HIDE_IP_LOADING

import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode.REAL_IP

import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode.REAL_IP_LOADING

import foundation.e.privacymodules.ipscramblermodule.IIpScramblerModule

import foundation.e.privacymodules.permissions.IPermissionsPrivacyModule

import foundation.e.privacymodules.permissions.data.ApplicationDescription
@@ -126,14 +130,16 @@ class IpScramblingStateUseCase( 
    }



    private fun applySettings(isQuickPrivacyEnabled: Boolean, isIpScramblingEnabled: Boolean) {

        val mode = localStateRepository.internetPrivacyMode.value

        val settingEnabled = isQuickPrivacyEnabled && isIpScramblingEnabled

        val currentMode = localStateRepository.internetPrivacyMode.value



        when {

            isQuickPrivacyEnabled && isIpScramblingEnabled &&

                mode in setOf(InternetPrivacyMode.REAL_IP, InternetPrivacyMode.REAL_IP_LOADING) ->

            settingEnabled && currentMode in setOf(REAL_IP, REAL_IP_LOADING) ->

                applyStartIpScrambling()



            mode in setOf(InternetPrivacyMode.HIDE_IP, InternetPrivacyMode.HIDE_IP_LOADING) ->

            !settingEnabled && currentMode in setOf(HIDE_IP, HIDE_IP_LOADING) ->

                ipScramblerModule.stop()



            else -> {}

        }

    }

trackers/src/main/java/foundation/e/privacymodules/trackers/DNSBlockerRunnable.kt

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.io.InputStreamReader 
import java.io.PrintWriter



class DNSBlockerRunnable(

    ct: Context,

    context: Context,

    private val trackersLogger: TrackersLogger,

    private val trackersRepository: TrackersRepository,

    private val whitelistRepository: WhitelistRepository
@@ -48,7 +48,7 @@ class DNSBlockerRunnable( 
    }



    init {

        initEBrowserDoTFix(ct)

        initEBrowserDoTFix(context)

    }



    @Synchronized