Merge branch 'master' into stable

ChangeLog.md

@@ -1247,3 +1247,42 @@
 * Updated Tor Snowflake bridge to version 2.10.1.
 * Fixed LAN rules handling for firewall.
 * Updated translations.
+
+**InviZible Pro beta 2.4.0**
+* Improved Tor Obfs4 bridges censorship resistance.
+* Updated Tor SnowFlake bridge stun servers.
+* Various fixes and optimisations.
+
+**InviZible Pro beta 2.4.1**
+* Display the destination port in real-time logs.
+* Socks5 proxy fixes and improvements.
+* Improved handling of local networks.
+* Tor Browser, OnionShare, Orbot, Briar, Cwtch are excluded from Tor by default as they contain their own Tor instance.
+* Fixes and optimizations.
+
+**InviZible Pro beta 2.4.2**
+* Added IGMP protocol logging in real-time logs.
+* Optimized performance and battery usage in VPN mode.
+* Various fixes for Root mode.
+* Added Dutch translation.
+* Updated Polish, Portuguese (Brazil), Persian and Spanish translations.
+
+**InviZible Pro beta 2.4.3**
+* Added x86_64 version for ChromeOS and emulators.
+* Updated Tor.
+* Updated Purple I2P to version 2.55.0.
+* Updated default DNSCrypt servers.
+* Optimized performance in VPN mode.
+* Added Tamil translation.
+* Updated Japanese, Chinese and Dutch translations.
+* Fixes and optimizations.
+
+**InviZible Pro stable 7.0.0**
+* Updated Purple I2P to version 2.55.0.
+* Added x86_64 version for ChromeOS and emulators.
+* Improved Tor Obfs4 bridges censorship resistance.
+* Optimized performance and battery usage in VPN mode.
+* Display the destination port in real-time logs.
+* Socks5 proxy fixes and improvements.
+* Added Dutch and Tamil translations.
+* Various fixes and optimisations.

README.md

@@ -6,7 +6,7 @@
 
 ### [Google Play stable version](https://play.google.com/store/apps/details?id=pan.alexander.tordnscrypt.gp)
 
-### [Download the latest version from Github](https://github.com/Gedsh/InviZible/releases/latest)
+### [Download the latest version from GitHub](https://github.com/Gedsh/InviZible/releases/latest)
 
 ### [IzzyOnDroid F-Droid beta version](https://apt.izzysoft.de/fdroid/index/apk/pan.alexander.tordnscrypt)
 
@@ -178,7 +178,7 @@ Please note that the XMR address has changed. The old address is no longer valid
 
 [GNU General Public License version 3](https://www.gnu.org/licenses/gpl-3.0.txt)
 
-Copyright (c) 2019-2024 Garmatin Oleksandr invizible.soft@gmail.com
+Copyright (c) 2019-2025 Garmatin Oleksandr invizible.soft@gmail.com
 
 All rights reserved
 

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.9.23'
+        kotlin_version = '2.0.21'
         dagger_version = '2.52'
         multidex_version = "2.0.1"
         work_version = "2.9.1"
@@ -23,6 +23,10 @@ buildscript {
     }
 }
 
+plugins {
+    id 'com.google.devtools.ksp' version '2.0.21-1.0.27' apply false
+}
+
 allprojects {
     repositories {
         google()

fastlane/metadata/android/en-US/changelogs/100240.txt

@@ -0,0 +1,4 @@
+**InviZible Pro beta 2.4.0**
+* Improved Tor Obfs4 bridges censorship resistance.
+* Updated Tor SnowFlake bridge stun servers.
+* Various fixes and optimisations.

fastlane/metadata/android/en-US/changelogs/100241.txt

@@ -0,0 +1,6 @@
+**InviZible Pro beta 2.4.1**
+* Display the destination port in real-time logs.
+* Socks5 proxy fixes and improvements.
+* Improved handling of local networks.
+* Tor Browser, OnionShare, Orbot, Briar, Cwtch are excluded from Tor by default as they contain their own Tor instance.
+* Fixes and optimizations.

fastlane/metadata/android/en-US/changelogs/100242.txt

@@ -0,0 +1,6 @@
+**InviZible Pro beta 2.4.2**
+* Added IGMP protocol logging in real-time logs.
+* Optimized performance and battery usage in VPN mode.
+* Various fixes for Root mode.
+* Added Dutch translation.
+* Updated Polish, Portuguese (Brazil), Persian and Spanish translations.

fastlane/metadata/android/en-US/changelogs/100243.txt

@@ -0,0 +1,9 @@
+**InviZible Pro beta 2.4.3**
+* Added x86_64 version for ChromeOS and emulators.
+* Updated Tor.
+* Updated Purple I2P to version 2.55.0.
+* Updated default DNSCrypt servers.
+* Optimized performance in VPN mode.
+* Added Tamil translation.
+* Updated Japanese, Chinese and Dutch translations.
+* Fixes and optimizations.

tordnscrypt/CMakeLists.txt

@@ -24,7 +24,9 @@ target_link_libraries( invizible
                        ${log-lib} )
 
 if(${CMAKE_ANDROID_ARCH_ABI} STREQUAL "arm64-v8a")
-    target_compile_options(invizible PRIVATE -Ofast -march=armv8-a -flto=thin -funsafe-math-optimizations -ffast-math -ftree-vectorize -fvectorize -fslp-vectorize)
-else()
+    target_compile_options(invizible PRIVATE -Ofast -march=armv8-a+simd -flto=thin -funsafe-math-optimizations -ffast-math -ftree-vectorize -fvectorize -fslp-vectorize)
+elseif(${CMAKE_ANDROID_ARCH_ABI} STREQUAL "armeabi-v7a")
     target_compile_options(invizible PRIVATE -Ofast -march=armv7-a -flto=thin -funsafe-math-optimizations -ffast-math -ftree-vectorize -fvectorize -fslp-vectorize)
+else ()
+    target_compile_options(invizible PRIVATE -Ofast -march=x86-64 -flto=thin -funsafe-math-optimizations -ffast-math -ftree-vectorize -fvectorize -fslp-vectorize)
 endif()

tordnscrypt/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'kotlin-kapt'
+    id 'com.google.devtools.ksp'
     id "kotlin-parcelize"
 }
 
@@ -16,7 +16,7 @@ android {
 
         fdroid{
             applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "6.9.1"
+            versionName "7.0.0"
             dimension = 'version'
             resValue 'string', 'package_name', applicationId
         }
@@ -44,7 +44,7 @@ android {
         universal{
             dimension = 'processor'
             resValue 'string', 'appProcVersion', 'universal'
-            versionCode = 4
+            versionCode = 5
 
             ndk {
                 abiFilters 'armeabi-v7a', 'arm64-v8a'
@@ -56,9 +56,9 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 34
-        versionCode 239
+        versionCode 243
 
-        resConfigs "en", "ru", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt", "pt-rBR", "el", "tr", "it", "uk", "bg", "ar"
+        resConfigs "en", "ru", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt", "pt-rBR", "el", "tr", "it", "uk", "bg", "ar", "nl", "ta"
 
         externalNativeBuild {
             cmake {
@@ -69,7 +69,9 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
+        def buildDate= System.getenv("SOURCE_DATE_EPOCH") == null
+                ? System.currentTimeMillis() : 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))
+        buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + buildDate + "L)"
 
         vectorDrawables.useSupportLibrary = true
     }
@@ -137,10 +139,15 @@ android {
         jvmTarget = '17'
     }
 
-    kapt {
-        javacOptions {
-            option("-Adagger.fastInit=enabled")
-        }
+    ksp {
+        arg("dagger.fastInit", "enabled")
+    }
+
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
     }
 
 }
@@ -157,9 +164,9 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation 'androidx.lifecycle:lifecycle-process:2.8.6'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.6'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'
+    implementation 'androidx.lifecycle:lifecycle-process:2.8.7'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
@@ -172,7 +179,7 @@ dependencies {
 
     //DI
     implementation "com.google.dagger:dagger:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+    ksp "com.google.dagger:dagger-compiler:$dagger_version"
     //Persistent Work Manager
     implementation "androidx.work:work-runtime-ktx:$work_version"
 }

tordnscrypt/libs/prebuild

@@ -2,20 +2,20 @@
 
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
-lyrebird_version=workaround/ntor-auth-mismatch
+lyrebird_version=prod
 dnscryptproxy_version=master
 snowflake_version=feat/check-dns-ip
 libzmq_version=v4.3.5
 conjure_version=prod
 webtunnel_version=prod
-tor_openssl_version=openssl-3.3.1
+tor_openssl_version=openssl-3.4.0
 libevent_version=release-2.1.12-stable
 zstd_version=v1.4.9
 xz_version=v5.2.4
 tor_version=prod
-i2pd_openssl_version=openssl-3.3.1
+i2pd_openssl_version=openssl-3.4.0
 miniupnpc_version=miniupnpc_2_2_8
-i2pd_version=2.54.0
+i2pd_version=2.55.0
 
 git clone --single-branch --branch $lyrebird_version https://gitlab.torproject.org/Gedsh/lyrebird