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

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

Merge branch '2-integrate_ipscrambling_module' into 'main' 

2: integrate ipscrambling module in git repos and update dependencies

See merge request !137
parents 4dcfe5eb 921756bb

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[submodule "ipscrambling/orbotservice"]

	path = ipscrambling/orbotservice

	url = git@gitlab.e.foundation:e/os/orbotservice.git

app/build.gradle

+24 −25
Original line number Diff line number Diff line
@@ -150,36 +150,35 @@ dependencies { 


    implementation project(':trackers')



    implementation 'foundation.e:privacymodule.tor:1.10.0-orbot-16.6.3-1'



    implementation 'foundation.e:elib:0.0.1-alpha11'

    implementation project(':ipscrambling')



    implementation (

        Libs.Kotlin.stdlib,

        Libs.AndroidX.coreKtx,

        Libs.AndroidX.appCompat,

        Libs.AndroidX.Fragment.fragmentKtx,

        Libs.AndroidX.Lifecycle.runtime,

        Libs.AndroidX.Lifecycle.viewmodel,

        Libs.AndroidX.work,

        Libs.material,



        Libs.AndroidX.navigation.fragmentKtx,

        Libs.AndroidX.navigation.uiKtx,



        Libs.Retrofit.retrofit,

        Libs.Retrofit.scalars,



        Libs.maplibre,

        Libs.mpAndroidCharts,



        Libs.telemetry,

        Libs.timber

        libs.e.elib,



        libs.androidx.core.ktx,

        libs.androidx.appcompat,

        libs.androidx.fragment.ktx,

        libs.androidx.lifecycle.runtime,

        libs.androidx.lifecycle.viewmodel,

        libs.androidx.work.ktx,

        libs.google.material,



        libs.androidx.navigation.fragment,

        libs.androidx.navigation.ui,



        libs.retrofit,

        libs.retrofit.scalars,



        libs.maplibre,

        libs.mpandroidcharts,



        libs.e.telemetry,

        libs.timber

    )



    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'

    debugImplementation libs.leakcanary



    testImplementation 'junit:junit:4.+'

    testImplementation libs.junit

}



static def log(Object val) {

app/src/main/java/foundation/e/advancedprivacy/DependencyContainer.kt

+1 −1
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ import foundation.e.advancedprivacy.features.trackers.TrackersViewModel 
import foundation.e.advancedprivacy.features.trackers.apptrackers.AppTrackersFragmentArgs

import foundation.e.advancedprivacy.features.trackers.apptrackers.AppTrackersViewModel

import foundation.e.privacymodules.fakelocation.FakeLocationModule

import foundation.e.privacymodules.ipscrambler.IIpScramblerModule

import foundation.e.privacymodules.ipscrambler.IpScramblerModule

import foundation.e.privacymodules.ipscramblermodule.IIpScramblerModule

import foundation.e.privacymodules.permissions.PermissionsPrivacyModule

import foundation.e.privacymodules.permissions.data.ApplicationDescription

import foundation.e.privacymodules.permissions.data.ProfileType

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode.HIDE_IP 
import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode.HIDE_IP_LOADING

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

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

import foundation.e.privacymodules.ipscramblermodule.IIpScramblerModule

import foundation.e.privacymodules.ipscrambler.IIpScramblerModule

import foundation.e.privacymodules.permissions.IPermissionsPrivacyModule

import foundation.e.privacymodules.permissions.data.ApplicationDescription

import kotlinx.coroutines.CoroutineScope

app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode 
import foundation.e.advancedprivacy.domain.usecases.AppListUseCase

import foundation.e.advancedprivacy.domain.usecases.GetQuickPrivacyStateUseCase

import foundation.e.advancedprivacy.domain.usecases.IpScramblingStateUseCase

import foundation.e.privacymodules.ipscramblermodule.IIpScramblerModule

import foundation.e.privacymodules.ipscrambler.IIpScramblerModule

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.FlowPreview

import kotlinx.coroutines.flow.MutableSharedFlow