From 6e18998b8f831fe9caabb332de6dfe05d631cfaf Mon Sep 17 00:00:00 2001 From: jacquarg Date: Thu, 20 Jun 2024 19:06:39 +0200 Subject: [PATCH] feat:2204: Update Orborservice to 17.2.1-RC-2 --- gradle/libs.versions.toml | 2 +- ipscrambling/commons.gradle | 8 +++--- ipscrambling/dependencies.gradle | 26 +++++++++---------- ipscrambling/exportdependencies/pom.xml | 2 +- ipscrambling/orbotservice | 2 +- .../ipscrambler/OrbotSupervisor.kt | 1 + settings.gradle | 2 +- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 24bcc501..310efee6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ kotlinx-coroutines = "1.7.3" kotlin = "1.9.21" androidx-navigation = "2.7.6" androidx-lifecycle = "2.6.2" -orbotservice = "orbot-16.6.3-2" +orbotservice = "orbot-17.2.1-1" retrofit = "2.9.0" pcap4j = "1.8.2" diff --git a/ipscrambling/commons.gradle b/ipscrambling/commons.gradle index 3be1be43..478724dc 100644 --- a/ipscrambling/commons.gradle +++ b/ipscrambling/commons.gradle @@ -3,10 +3,10 @@ Applies across all modules */ android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' + compileSdkVersion buildConfig.compileSdk + compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } diff --git a/ipscrambling/dependencies.gradle b/ipscrambling/dependencies.gradle index 31b6b783..8d072607 100644 --- a/ipscrambling/dependencies.gradle +++ b/ipscrambling/dependencies.gradle @@ -1,6 +1,6 @@ ext { orbotversions = [ - android_material : "1.4.0", + android_material : "1.9.0", android_shell : "1.0.0", android_snowfall : "1.2.1", android_volley : "1.2.0", @@ -15,19 +15,17 @@ ext { androidx_multidex : "2.0.1", androidx_palette : "1.0.0", androidx_recyclerview : "1.2.1", + androidx_work : "2.7.1", apl_appintro : "v4.2.3", bclogic_pulsator : "1.0.3", - fastlane_screengrab : "1.2.0", - guardian_geoip : "20191217", - guardian_jsocks : "1.0.4", + fastlane_screengrab : "2.0.0", guardian_jtorctl : "0.4.5.7", - ipt_proxy : "1.8.1", - portmapper : "2.0.5", - tor_android : "0.4.7.10", + ipt_proxy : "1.7.1", + orbot_service : "orbot-17.2.1-1", //libs.versions.orbotservice, + orbot_service_dependencies : "orbot-17.2.1-1", pcap_core : "1.8.2", pcap_factory : "1.8.2", - orbot_service : "orbot-16.6.3-2", //libs.versions.orbotservice, - orbot_service_dependencies : "orbot-16.6.3-1", + tor_android : "0.4.8.7", ] orbotlibs = [ @@ -47,16 +45,16 @@ ext { androidx_multidex : "androidx.multidex:multidex:$orbotversions.androidx_multidex", androidx_palette : "androidx.palette:palette:$orbotversions.androidx_palette", androidx_recyclerview : "androidx.recyclerview:recyclerview:$orbotversions.androidx_recyclerview", + androidx_work : "androidx.work:work-runtime:$orbotversions.androidx_work", + androidx_work_kotlin : "androidx.work:work-runtime-ktx:$orbotversions.androidx_work", apl_appintro : "com.github.apl-devs:appintro:$orbotversions.apl_appintro", bclogic_pulsator : "pl.bclogic:pulsator4droid:$orbotversions.bclogic_pulsator", fastlane_screengrab : "tools.fastlane:screengrab:$orbotversions.fastlane_screengrab", guardian_geoip : "foundation.e:geoip:$orbotversions.orbot_service_dependencies", - guardian_jsocks : "com.gitlab.guardianproject:jsocksandroid:$orbotversions.guardian_jsocks", guardian_jtorctl : "info.guardianproject:jtorctl:$orbotversions.guardian_jtorctl", - ipt_proxy : "foundation.e:OrbotIPtProxy:$orbotversions.orbot_service_dependencies", - portmapper : "com.offbynull.portmapper:portmapper:$orbotversions.portmapper", - tor_android : "foundation.e:tor-android:$orbotversions.orbot_service_dependencies", + orbotlib : "foundation.e:orbotlib:$orbotversions.orbot_service_dependencies", pcap_core : "org.pcap4j:pcap4j-core:$orbotversions.pcap_core", - pcap_factory : "org.pcap4j:pcap4j-packetfactory-static:$orbotversions.pcap_factory" + pcap_factory : "org.pcap4j:pcap4j-packetfactory-static:$orbotversions.pcap_factory", + tor_android : "foundation.e:tor-android:$orbotversions.orbot_service_dependencies", ] } diff --git a/ipscrambling/exportdependencies/pom.xml b/ipscrambling/exportdependencies/pom.xml index be287474..88238b60 100644 --- a/ipscrambling/exportdependencies/pom.xml +++ b/ipscrambling/exportdependencies/pom.xml @@ -3,7 +3,7 @@ 4.0.0 foundation.e orbotservice - orbot-16.6.3-1 + orbot-17.2.1-1 diff --git a/ipscrambling/orbotservice b/ipscrambling/orbotservice index 16c61e2f..47063de9 160000 --- a/ipscrambling/orbotservice +++ b/ipscrambling/orbotservice @@ -1 +1 @@ -Subproject commit 16c61e2f6fcb78c664aa23b9fed24048b52d943a +Subproject commit 47063de997bd00a45fdfba3a0931d9358d954538 diff --git a/ipscrambling/src/main/java/foundation/e/advancedprivacy/ipscrambler/OrbotSupervisor.kt b/ipscrambling/src/main/java/foundation/e/advancedprivacy/ipscrambler/OrbotSupervisor.kt index 8f8a6be1..bbba37f7 100644 --- a/ipscrambling/src/main/java/foundation/e/advancedprivacy/ipscrambler/OrbotSupervisor.kt +++ b/ipscrambling/src/main/java/foundation/e/advancedprivacy/ipscrambler/OrbotSupervisor.kt @@ -190,6 +190,7 @@ class OrbotSupervisor( private fun sendIntentToService(action: String, extra: Bundle? = null) { val intent = Intent(context, OrbotService::class.java) intent.action = action + intent.putExtra(OrbotConstants.EXTRA_NOT_SYSTEM, true) extra?.let { intent.putExtras(it) } context.startService(intent) } diff --git a/settings.gradle b/settings.gradle index 705504d9..48b05551 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,7 +16,7 @@ include ':trackers' include ':permissionseos' include ':permissionseos:libs:hidden-apis-stub' include ':ipscrambling' -include ':ipscrambling:orbotservice' +//include ':ipscrambling:orbotservice' include ':trackersservicestandalone' include ':trackersserviceeos' -- GitLab