Merge branch 'master' into stable

Gedsh · Nov 7, 2024 · 2d8de32 · 2d8de32
2 parents 0a5de7d + 4748be4
commit 2d8de32
Show file tree

Hide file tree

Showing 159 changed files with 7,436 additions and 2,679 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1184,3 +1184,36 @@
 **InviZible Pro beta 2.3.2**
 * Updated Tor.
 * Fixes and optimizations.
+
+**InviZible Pro beta 2.3.3**
+* Updated Purple I2P to version 2.54.0.
+* Updated Tor Snowflake bridge.
+* Added option for downloading and updating DNSCrypt blacklists.
+* Tor apps isolation is enabled by default.
+* Fixed requesting Tor bridges via the app.
+* Updated German and Spanish translations.
+
+**InviZible Pro beta 2.3.4**
+* Implemented the ability to use the firewall when other modules are stopped.
+* Added a stop button to the notification.
+* Fixes and optimizations.
+
+**InviZible Pro beta 2.3.5**
+* Updated Tor.
+* Updated Tor Snowflake bridge.
+* Updated Tor Lyrebird bridge to version 0.4.0.
+* Implemented the ability to insert a list of DNSCrypt rules.
+* Fixes and optimizations.
+
+**InviZible Pro beta 2.3.6**
+* Added an option for quick access to Always-on VPN settings.
+* Improvements and fixes for standalone firewall operation.
+* Improvements for the firewall in root mode for Android versions above 5.
+* Removed the Fastly rendezvous of the Tor snowflake bridge.
+* Minor fixes and optimisations.
+
+**InviZible Pro beta 2.3.7**
+* Updated Tor to version 4.8.13.
+* Fixed detection of whether a cellular network interface can provide an internet connection.
+* Fixed I2PD subscriptions option.
+* Updated German, Spanish, Greek, Chinese, Portuguese (Brazil), Persian and Bulgarian translations.
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,9 @@
 buildscript {
     ext {
         kotlin_version = '1.9.23'
-        dagger_version = '2.51.1'
+        dagger_version = '2.52'
         multidex_version = "2.0.1"
-        work_version = "2.9.0"
+        work_version = "2.9.1"
     }
 
 
@@ -14,7 +14,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.1'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
 

diff --git a/fastlane/metadata/android/en-US/changelogs/100233.txt b/fastlane/metadata/android/en-US/changelogs/100233.txt
@@ -0,0 +1,7 @@
+**InviZible Pro beta 2.3.3**
+* Updated Purple I2P to version 2.54.0.
+* Updated Tor Snowflake bridge.
+* Added option for downloading and updating DNSCrypt blacklists.
+* Tor apps isolation is enabled by default.
+* Fixed requesting Tor bridges via the app.
+* Updated German and Spanish translations.
diff --git a/fastlane/metadata/android/en-US/changelogs/100234.txt b/fastlane/metadata/android/en-US/changelogs/100234.txt
@@ -0,0 +1,4 @@
+**InviZible Pro beta 2.3.4**
+* Implemented the ability to use the firewall when other modules are stopped.
+* Added a stop button to the notification.
+* Fixes and optimizations.
diff --git a/fastlane/metadata/android/en-US/changelogs/100235.txt b/fastlane/metadata/android/en-US/changelogs/100235.txt
@@ -0,0 +1,6 @@
+**InviZible Pro beta 2.3.5**
+* Updated Tor.
+* Updated Tor Snowflake bridge.
+* Updated Tor Lyrebird bridge to version 0.4.0.
+* Implemented the ability to insert a list of DNSCrypt rules.
+* Fixes and optimizations.
diff --git a/fastlane/metadata/android/en-US/changelogs/100236.txt b/fastlane/metadata/android/en-US/changelogs/100236.txt
@@ -0,0 +1,6 @@
+**InviZible Pro beta 2.3.6**
+* Added an option for quick access to Always-on VPN settings.
+* Improvements and fixes for standalone firewall operation.
+* Improvements for the firewall in root mode for Android versions above 5.
+* Removed the Fastly rendezvous of the Tor snowflake bridge.
+* Minor fixes and optimisations.
diff --git a/fastlane/metadata/android/en-US/changelogs/100237.txt b/fastlane/metadata/android/en-US/changelogs/100237.txt
@@ -0,0 +1,5 @@
+**InviZible Pro beta 2.3.7**
+* Updated Tor to version 4.8.13.
+* Fixed detection of whether a cellular network interface can provide an internet connection.
+* Fixed I2PD subscriptions option.
+* Updated German, Spanish, Greek, Chinese, Portuguese (Brazil), Persian and Bulgarian translations.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
-distributionSha256Sum=194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0
+distributionSha256Sum=distributionSha256Sum=194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0
diff --git a/tordnscrypt/build.gradle b/tordnscrypt/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-kapt'
+    id "kotlin-parcelize"
 }
 
 android {
@@ -15,7 +16,7 @@ android {
 
         fdroid{
             applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "6.8.0"
+            versionName "6.9.0"
             dimension = 'version'
             resValue 'string', 'package_name', applicationId
         }
@@ -55,7 +56,7 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 34
-        versionCode 232
+        versionCode 237
 
         resConfigs "en", "ru", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt", "pt-rBR", "el", "tr", "it", "uk", "bg", "ar"
 
@@ -125,7 +126,7 @@ android {
         }
     }
 
-    ndkVersion '23.0.7421159'
+    ndkVersion '23.1.7779620'
 
     buildFeatures {
         viewBinding true
@@ -156,16 +157,16 @@ 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.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
+    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'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation 'eu.chainfire:libsuperuser:1.1.1'
     implementation 'com.jrummyapps:android-shell:1.0.1'
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation project(':filepicker')
 

diff --git a/tordnscrypt/libs/arm64-v8a/libi2pd.so b/tordnscrypt/libs/arm64-v8a/libi2pd.so
diff --git a/tordnscrypt/libs/arm64-v8a/libobfs4proxy.so b/tordnscrypt/libs/arm64-v8a/libobfs4proxy.so
diff --git a/tordnscrypt/libs/arm64-v8a/libsnowflake.so b/tordnscrypt/libs/arm64-v8a/libsnowflake.so
diff --git a/tordnscrypt/libs/arm64-v8a/libtor.so b/tordnscrypt/libs/arm64-v8a/libtor.so
diff --git a/tordnscrypt/libs/armeabi-v7a/libi2pd.so b/tordnscrypt/libs/armeabi-v7a/libi2pd.so
diff --git a/tordnscrypt/libs/armeabi-v7a/libobfs4proxy.so b/tordnscrypt/libs/armeabi-v7a/libobfs4proxy.so
diff --git a/tordnscrypt/libs/armeabi-v7a/libsnowflake.so b/tordnscrypt/libs/armeabi-v7a/libsnowflake.so
diff --git a/tordnscrypt/libs/armeabi-v7a/libtor.so b/tordnscrypt/libs/armeabi-v7a/libtor.so
diff --git a/tordnscrypt/libs/build b/tordnscrypt/libs/build
@@ -6,7 +6,7 @@ cd "$( dirname "${BASH_SOURCE[0]}" )"
 ## Config ##
 ############
 
-ndk_version=21.3.6528147
+ndk_version=23.1.7779620
 if [[ -d "/opt/android-sdk/ndk/${ndk_version}" ]]
 then
     NDK="/opt/android-sdk/ndk/${ndk_version}"
@@ -78,7 +78,7 @@ popd
 ################
 
 pushd libzmq/builds/android/
-export NDK_VERSION="android-ndk-r21c"
+export NDK_VERSION="android-ndk-r23b"
 export ANDROID_NDK_ROOT=$NDK
 if [[ $ABI == arm64-v8a ]]
 then
@@ -145,7 +145,7 @@ then
     NDK_PLATFORM_LEVEL=21 NDK_BIT=64 make showsetup
 else
     #compile armeabi-v7a things...
-    export APP_ABI=armeabi
+    export APP_ABI=armeabi-v7a
     make clean
     make
     make showsetup

diff --git a/tordnscrypt/libs/prebuild b/tordnscrypt/libs/prebuild
@@ -15,7 +15,7 @@ xz_version=v5.2.4
 tor_version=prod
 i2pd_openssl_version=openssl-3.3.1
 miniupnpc_version=miniupnpc_2_2_8
-i2pd_version=2.53.1
+i2pd_version=2.54.0
 
 git clone --single-branch --branch $lyrebird_version https://gitlab.torproject.org/Gedsh/lyrebird
 

diff --git a/tordnscrypt/owner.gradle b/tordnscrypt/owner.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-kapt'
+    id "kotlin-parcelize"
 }
 
 def keystorePropertiesFile = file("/home/alexander/.local/KStore/keystore.properties")
@@ -34,23 +35,23 @@ android {
     productFlavors {
         lite {
             applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "6.8.0"
+            versionName "6.9.0"
             dimension = 'version'
             signingConfig signingConfigs.stablesign
             resValue 'string', 'package_name', applicationId
         }
 
         pro {
             applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "6.8.0"
+            versionName "6.9.0"
             dimension = 'version'
             signingConfig signingConfigs.stablesign
             resValue 'string', 'package_name', applicationId
         }
 
         beta {
             applicationId "pan.alexander.tordnscrypt"
-            versionName "2.3.2"
+            versionName "2.3.7"
             dimension = 'version'
             signingConfig signingConfigs.betasign
             resValue 'string', 'package_name', applicationId
@@ -59,7 +60,7 @@ android {
         google_play {
             minSdkVersion 22
             applicationId "pan.alexander.tordnscrypt.gp"
-            versionName "6.8.0"
+            versionName "6.9.0"
             dimension = 'version'
             signingConfig signingConfigs.stablesign
             resValue 'string', 'package_name', applicationId
@@ -91,7 +92,7 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 34
-        versionCode 232
+        versionCode 237
 
         resConfigs "en", "ru", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt", "pt-rBR", "el", "tr", "it", "uk", "bg", "ar"
 
@@ -167,7 +168,7 @@ android {
         }
     }
 
-    ndkVersion '23.0.7421159'
+    ndkVersion '23.1.7779620'
 
     buildFeatures {
         viewBinding true
@@ -200,17 +201,17 @@ 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.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
+    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'
     google_playImplementation 'com.android.billingclient:billing:6.2.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation 'eu.chainfire:libsuperuser:1.1.1'
     implementation 'com.jrummyapps:android-shell:1.0.1'
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
     implementation project(':filepicker')
 
     //DI

diff --git a/tordnscrypt/src/fdroid/AndroidManifest.xml b/tordnscrypt/src/fdroid/AndroidManifest.xml
@@ -223,6 +223,10 @@
             android:name=".settings.firewall.FirewallNotification"
             android:exported="false" />
 
+        <receiver
+            android:name=".modules.ModulesServiceNotificationManager"
+            android:exported="false" />
+
         <activity
             android:name=".backup.BackupActivity"
             android:theme="@style/AppTheme" />

diff --git a/tordnscrypt/src/google_play/AndroidManifest.xml b/tordnscrypt/src/google_play/AndroidManifest.xml
@@ -219,6 +219,10 @@
             android:name=".settings.firewall.FirewallNotification"
             android:exported="false" />
 
+        <receiver
+            android:name=".modules.ModulesServiceNotificationManager"
+            android:exported="false" />
+
         <activity
             android:name=".backup.BackupActivity"
             android:theme="@style/AppTheme" />

diff --git a/tordnscrypt/src/main/AndroidManifest.xml b/tordnscrypt/src/main/AndroidManifest.xml
@@ -206,6 +206,10 @@
             android:name=".settings.firewall.FirewallNotification"
             android:exported="false" />
 
+        <receiver
+            android:name=".modules.ModulesServiceNotificationManager"
+            android:exported="false" />
+
         <activity
             android:name=".backup.BackupActivity"
             android:theme="@style/AppTheme" />

diff --git a/tordnscrypt/src/main/assets/dnscrypt.mp3 b/tordnscrypt/src/main/assets/dnscrypt.mp3
diff --git a/tordnscrypt/src/main/assets/tor.mp3 b/tordnscrypt/src/main/assets/tor.mp3