diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle index 024d9879..9737cd1f 100644 --- a/app/android/app/build.gradle +++ b/app/android/app/build.gradle @@ -1,7 +1,7 @@ plugins { id "com.android.application" id "kotlin-android" - id "org.jetbrains.kotlin.plugin.compose" version "2.2.20" + id "org.jetbrains.kotlin.plugin.compose" version "2.3.10" // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } diff --git a/app/android/build.gradle b/app/android/build.gradle index 31825c66..49a3c317 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -5,7 +5,7 @@ ext { } buildscript { - ext.kotlin_version = '2.2.20' + ext.kotlin_version = '2.3.10' } allprojects { diff --git a/app/android/settings.gradle b/app/android/settings.gradle index 5061c737..06086882 100644 --- a/app/android/settings.gradle +++ b/app/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version '8.13.2' apply false - id "org.jetbrains.kotlin.android" version "2.2.20" apply false + id "org.jetbrains.kotlin.android" version "2.3.10" apply false } include ":app" diff --git a/app/assets/preferences/builtin-bridges.json b/app/assets/preferences/builtin-bridges.json index 37cbeae0..af1f8ac4 100644 --- a/app/assets/preferences/builtin-bridges.json +++ b/app/assets/preferences/builtin-bridges.json @@ -1 +1 @@ -{"meek":["meek_lite 192.0.2.20:80 url=https://1603026938.rsc.cdn77.org front=www.phpmyadmin.net utls=HelloRandomizedALPN"],"meek-azure":["meek_lite 192.0.2.20:80 url=https://1603026938.rsc.cdn77.org front=www.phpmyadmin.net utls=HelloRandomizedALPN"],"obfs4":["obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0","obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0","obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0","obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0","obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0","obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1","obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0","obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0","obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0","obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0","obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"],"snowflake":["snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://1098762253.rsc.cdn77.org/ fronts=app.datapacket.com,www.datapacket.com ice=stun:stun.epygi.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.mixvoip.com:3478,stun:stun.nextcloud.com:3478,stun:stun.bethesda.net:3478,stun:stun.nextcloud.com:443 utls-imitate=hellorandomizedalpn","snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://1098762253.rsc.cdn77.org/ fronts=app.datapacket.com,www.datapacket.com ice=stun:stun.epygi.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.mixvoip.com:3478,stun:stun.nextcloud.com:3478,stun:stun.bethesda.net:3478,stun:stun.nextcloud.com:443 utls-imitate=hellorandomizedalpn"]} +{"meek":["meek_lite 192.0.2.20:80 url=https://1603026938.rsc.cdn77.org front=www.phpmyadmin.net utls=HelloRandomizedALPN"],"meek-azure":["meek_lite 192.0.2.20:80 url=https://1603026938.rsc.cdn77.org front=www.phpmyadmin.net utls=HelloRandomizedALPN"],"obfs4":["obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0","obfs4 212.83.43.74:443 39562501228A4D5E27FCA4C0C81A01EE23AE3EE4 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=1","obfs4 212.83.43.95:443 BFE712113A72899AD685764B211FACD30FF52C31 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=1","obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0","obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0","obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0","obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"],"snowflake":["snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://1098762253.rsc.cdn77.org/ fronts=app.datapacket.com,www.datapacket.com ice=stun:stun.epygi.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.mixvoip.com:3478,stun:stun.nextcloud.com:3478,stun:stun.bethesda.net:3478,stun:stun.nextcloud.com:443 utls-imitate=hellorandomizedalpn","snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://1098762253.rsc.cdn77.org/ fronts=app.datapacket.com,www.datapacket.com ice=stun:stun.epygi.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.mixvoip.com:3478,stun:stun.nextcloud.com:3478,stun:stun.bethesda.net:3478,stun:stun.nextcloud.com:443 utls-imitate=hellorandomizedalpn"]} diff --git a/app/pubspec.yaml b/app/pubspec.yaml index c7a25ac6..893bd67b 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: copy_with_extension: ^11.0.0 country_codes: ^3.3.0 country_flags: ^4.1.2 - crypto: ^3.0.6 + crypto: ^3.0.7 cryptography_flutter: ^2.3.4 device_info_plus: ^12.3.0 drift: ^2.31.0 @@ -51,7 +51,7 @@ dependencies: lexo_rank: git: url: https://github.com/FaFre/lexo_rank.git - local_auth: ^3.0.0 + local_auth: ^3.0.1 locale_resolver: path: ../packages/locale_resolver logger: ^2.6.2 @@ -95,7 +95,7 @@ dependencies: uuid: ^4.5.3 dev_dependencies: - build_runner: ^2.11.1 + build_runner: ^2.12.2 copy_with_extension_gen: ^11.0.0 flutter_launcher_icons: ^0.14.4 flutter_test: diff --git a/packages/flutter_mozilla_components/android/build.gradle b/packages/flutter_mozilla_components/android/build.gradle index fdd4cb16..517e8272 100644 --- a/packages/flutter_mozilla_components/android/build.gradle +++ b/packages/flutter_mozilla_components/android/build.gradle @@ -2,7 +2,7 @@ group = "eu.weblibre.flutter_mozilla_components" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.2.20" + ext.kotlin_version = "2.3.10" ext.mozillaComponentsVersion = '148.0' repositories { @@ -143,12 +143,12 @@ dependencies { implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'com.google.android.material:material:1.13.0' - implementation 'com.mikepenz:iconics-core:5.4.0' - implementation 'com.mikepenz:community-material-typeface:7.0.96.1-kotlin@aar' + implementation 'com.mikepenz:iconics-core:5.5.0' + implementation 'com.mikepenz:community-material-typeface:7.0.96.2-kotlin@aar' //https://stackoverflow.com/questions/73782320/onbackinvokedcallback-is-not-enabled-for-the-application-in-set-androidenableo - implementation 'androidx.activity:activity-ktx:1.12.3' - implementation 'androidx.paging:paging-runtime-ktx:3.4.0' + implementation 'androidx.activity:activity-ktx:1.12.4' + implementation 'androidx.paging:paging-runtime-ktx:3.4.1' testImplementation("org.jetbrains.kotlin:kotlin-test") - testImplementation("org.mockito:mockito-core:5.15.2") + testImplementation("org.mockito:mockito-core:5.22.0") } diff --git a/packages/flutter_mozilla_components/example/android/settings.gradle b/packages/flutter_mozilla_components/example/android/settings.gradle index c9996f61..bacade68 100644 --- a/packages/flutter_mozilla_components/example/android/settings.gradle +++ b/packages/flutter_mozilla_components/example/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version "8.13.2" apply false - id "org.jetbrains.kotlin.android" version "2.2.20" apply false + id "org.jetbrains.kotlin.android" version "2.3.10" apply false } include ":app" diff --git a/packages/flutter_mozilla_components/pubspec.yaml b/packages/flutter_mozilla_components/pubspec.yaml index 66333fa6..9ff0918f 100644 --- a/packages/flutter_mozilla_components/pubspec.yaml +++ b/packages/flutter_mozilla_components/pubspec.yaml @@ -18,7 +18,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.7 + pigeon: ^26.1.10 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/flutter_tor/android/build.gradle b/packages/flutter_tor/android/build.gradle index 885a8b1b..18a5bd34 100644 --- a/packages/flutter_tor/android/build.gradle +++ b/packages/flutter_tor/android/build.gradle @@ -2,7 +2,7 @@ group = "eu.weblibre.flutter_tor" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.2.20" + ext.kotlin_version = "2.3.10" repositories { google() mavenCentral() @@ -50,11 +50,11 @@ android { dependencies { // Tor core libraries - implementation("info.guardianproject:tor-android:0.4.8.22") + implementation("info.guardianproject:tor-android:0.4.9.5") implementation("info.guardianproject:jtorctl:0.4.5.7") // Pluggable transports - implementation("com.netzarchitekten:IPtProxy:4.3.0") + implementation("com.netzarchitekten:IPtProxy:5.2.0") // Coroutines for async operations implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") @@ -62,7 +62,7 @@ android { // Testing testImplementation("org.jetbrains.kotlin:kotlin-test") - testImplementation("org.mockito:mockito-core:5.0.0") + testImplementation("org.mockito:mockito-core:5.22.0") } testOptions { diff --git a/packages/flutter_tor/android/src/main/kotlin/eu/weblibre/flutter_tor/PluggableTransportManager.kt b/packages/flutter_tor/android/src/main/kotlin/eu/weblibre/flutter_tor/PluggableTransportManager.kt index 9bec6acc..17238210 100644 --- a/packages/flutter_tor/android/src/main/kotlin/eu/weblibre/flutter_tor/PluggableTransportManager.kt +++ b/packages/flutter_tor/android/src/main/kotlin/eu/weblibre/flutter_tor/PluggableTransportManager.kt @@ -4,7 +4,7 @@ import android.content.Context import android.util.Log import IPtProxy.Controller import IPtProxy.IPtProxy -import IPtProxy.OnTransportStopped +import IPtProxy.OnTransportEvents import java.io.File /** @@ -28,7 +28,20 @@ class PluggableTransportManager(private val context: Context) { private val stateDir = File(context.cacheDir, "iptproxy") private val activeTransports = mutableSetOf() - private val statusCallback = object : OnTransportStopped { + private val statusCallback = object : OnTransportEvents { + override fun connected(name: String?) { + if (name != null) { + Log.d(TAG, "$name connected") + } + } + + override fun error(name: String?, exception: Exception?) { + if (name != null) { + activeTransports.remove(name) + } + Log.e(TAG, "${name ?: "transport"} reported error: ${exception?.message}", exception) + } + override fun stopped(name: String?, exception: Exception?) { if (name != null) { activeTransports.remove(name) diff --git a/packages/flutter_tor/example/android/settings.gradle.kts b/packages/flutter_tor/example/android/settings.gradle.kts index 7368634c..5aac7bce 100644 --- a/packages/flutter_tor/example/android/settings.gradle.kts +++ b/packages/flutter_tor/example/android/settings.gradle.kts @@ -20,7 +20,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" id("com.android.application") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("org.jetbrains.kotlin.android") version "2.3.10" apply false } include(":app") diff --git a/packages/flutter_tor/pubspec.yaml b/packages/flutter_tor/pubspec.yaml index ebd6f41a..83702308 100644 --- a/packages/flutter_tor/pubspec.yaml +++ b/packages/flutter_tor/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.7 + pigeon: ^26.1.10 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/locale_resolver/android/build.gradle b/packages/locale_resolver/android/build.gradle index 8519b342..863f8736 100644 --- a/packages/locale_resolver/android/build.gradle +++ b/packages/locale_resolver/android/build.gradle @@ -2,7 +2,7 @@ group = "eu.weblibre.locale_resolver" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.2.20" + ext.kotlin_version = "2.3.10" repositories { google() mavenCentral() @@ -49,7 +49,7 @@ android { dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") - testImplementation("org.mockito:mockito-core:5.0.0") + testImplementation("org.mockito:mockito-core:5.22.0") } testOptions { diff --git a/packages/locale_resolver/example/android/settings.gradle.kts b/packages/locale_resolver/example/android/settings.gradle.kts index 7368634c..5aac7bce 100644 --- a/packages/locale_resolver/example/android/settings.gradle.kts +++ b/packages/locale_resolver/example/android/settings.gradle.kts @@ -20,7 +20,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" id("com.android.application") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("org.jetbrains.kotlin.android") version "2.3.10" apply false } include(":app") diff --git a/packages/locale_resolver/pubspec.yaml b/packages/locale_resolver/pubspec.yaml index f653dbcb..dff763fd 100644 --- a/packages/locale_resolver/pubspec.yaml +++ b/packages/locale_resolver/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.7 + pigeon: ^26.1.10 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/simple_intent_receiver/android/build.gradle b/packages/simple_intent_receiver/android/build.gradle index ec4a41ef..0831356e 100644 --- a/packages/simple_intent_receiver/android/build.gradle +++ b/packages/simple_intent_receiver/android/build.gradle @@ -2,7 +2,7 @@ group = "eu.weblibre.simple_intent_receiver" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.2.20" + ext.kotlin_version = "2.3.10" repositories { google() mavenCentral() @@ -49,7 +49,7 @@ android { dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") - testImplementation("org.mockito:mockito-core:5.0.0") + testImplementation("org.mockito:mockito-core:5.22.0") } testOptions { diff --git a/packages/simple_intent_receiver/example/android/settings.gradle.kts b/packages/simple_intent_receiver/example/android/settings.gradle.kts index 3281b683..3fe4db0e 100644 --- a/packages/simple_intent_receiver/example/android/settings.gradle.kts +++ b/packages/simple_intent_receiver/example/android/settings.gradle.kts @@ -19,7 +19,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" id("com.android.application") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("org.jetbrains.kotlin.android") version "2.3.10" apply false } include(":app") diff --git a/packages/simple_intent_receiver/pubspec.yaml b/packages/simple_intent_receiver/pubspec.yaml index 90fc6740..4345316f 100644 --- a/packages/simple_intent_receiver/pubspec.yaml +++ b/packages/simple_intent_receiver/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.7 + pigeon: ^26.1.10 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/speech_to_text_dialog/android/build.gradle b/packages/speech_to_text_dialog/android/build.gradle index fffcb4ec..16ecaa86 100644 --- a/packages/speech_to_text_dialog/android/build.gradle +++ b/packages/speech_to_text_dialog/android/build.gradle @@ -2,7 +2,7 @@ group = "eu.weblibre.speech_to_text_dialog" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.2.20" + ext.kotlin_version = "2.3.10" repositories { google() mavenCentral() @@ -49,7 +49,7 @@ android { dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") - testImplementation("org.mockito:mockito-core:5.0.0") + testImplementation("org.mockito:mockito-core:5.22.0") } testOptions { diff --git a/packages/speech_to_text_dialog/example/android/settings.gradle.kts b/packages/speech_to_text_dialog/example/android/settings.gradle.kts index 7368634c..5aac7bce 100644 --- a/packages/speech_to_text_dialog/example/android/settings.gradle.kts +++ b/packages/speech_to_text_dialog/example/android/settings.gradle.kts @@ -20,7 +20,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" id("com.android.application") version "8.13.2" apply false - id("org.jetbrains.kotlin.android") version "2.2.20" apply false + id("org.jetbrains.kotlin.android") version "2.3.10" apply false } include(":app") diff --git a/packages/speech_to_text_dialog/pubspec.yaml b/packages/speech_to_text_dialog/pubspec.yaml index 004d9b38..167cb753 100644 --- a/packages/speech_to_text_dialog/pubspec.yaml +++ b/packages/speech_to_text_dialog/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.7 + pigeon: ^26.1.10 flutter: plugin: