Merge branch '2-integrate_ipscrambling_module' into 'main'

2: integrate ipscrambling module in git repos and update dependencies

See merge request e/os/advanced-privacy!137

4 files changed, 27 insertions, 28 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 8a9f1fd..af05ec0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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) {
diff --git a/app/src/main/java/foundation/e/advancedprivacy/DependencyContainer.kt b/app/src/main/java/foundation/e/advancedprivacy/DependencyContainer.kt
index 5664515..820a868 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/DependencyContainer.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/DependencyContainer.kt
@@ -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
diff --git a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt
index d2d26e6..70607cf 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt
@@ -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
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt
index 051c8e8..4c707a2 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt
@@ -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