Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Gedsh committed Jul 29, 2023
2 parents 1b32716 + 30c5e73 commit f3ad3f5
Show file tree
Hide file tree
Showing 93 changed files with 1,135 additions and 517 deletions.
41 changes: 41 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -901,3 +901,44 @@
* Fixed requesting for new Tor bridges.
* Updated Tor.
* Updated DNSCrypt.

**InviZible Pro beta 1.8.6**
* Updated built-in snowflake and meek_lite Tor bridges.
* IPv6 is enabled by default for app modules.
* Fixes and optimizations.

**InviZible Pro beta 1.8.7**
* Updated Purple I2P to version 2.48.0.
* Added support for the Tor Conjure bridge.
* Fixed using Fastly server with Snowflake on Android versions below 8.
* DNSCrypt shows that it is running if at least one server is ready.
* Fixes and optimizations.

**InviZible Pro beta 1.8.8**
* Updated Tor Snowflake bridge to version 2.6.0.
* Improved Tor Conjure bridge connection stability.
* Fixes and optimizations.

**InviZible Pro beta 1.8.9**
* Updated Tor Conjure bridge.
* Added option to separately activate and configure socks5 proxy.
* Fixed adding Tor bridges without fingerprint.
* Fixed using X bandwidth with Purple I2P.

**InviZible Pro beta 1.9.0**
* Fixed Tor Snowflake bridge failure on Android 11 and above.

**InviZible Pro beta 1.9.1**
* Improved Tor Conjure bridge connection stability.
* Fixed adding meek_lite bridges with a domain that contains a hyphen.

**InviZible Pro beta 1.9.2**
* Improved Tor Conjure bridge censorship resistance.
* Improved meek_lite bridge censorship resistance.
* Fixed modules not installed on initial app startup.
* Updated German translation.
* Fixes and optimizations.

**InviZible Pro beta 1.9.3**
* Fixed Tor not starting after enabling Allow Tor Tethering.
* Fixes and optimizations.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"


Expand Down
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/100186.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**InviZible Pro beta 1.8.6**
* Updated built-in snowflake and meek_lite Tor bridges.
* IPv6 is enabled by default for app modules.
* Fixes and optimizations.
6 changes: 6 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/100187.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
**InviZible Pro beta 1.8.7**
* Updated Purple I2P to version 2.48.0.
* Added support for the Tor Conjure bridge.
* Fixed using Fastly server with Snowflake on Android versions below 8.
* DNSCrypt shows that it is running if at least one server is ready.
* Fixes and optimizations.
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/100188.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**InviZible Pro beta 1.8.8**
* Updated Tor Snowflake bridge to version 2.6.0.
* Improved Tor Conjure bridge connection stability.
* Fixes and optimizations.
5 changes: 5 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/100189.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
**InviZible Pro beta 1.8.9**
* Updated Tor Conjure bridge.
* Added option to separately activate and configure socks5 proxy.
* Fixed adding Tor bridges without fingerprint.
* Fixed using X bandwidth with Purple I2P.
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/100190.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**InviZible Pro beta 1.9.0**
* Fixed Tor Snowflake bridge failure on Android 11 and above.
3 changes: 3 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/100191.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**InviZible Pro beta 1.9.1**
* Improved Tor Conjure bridge connection stability.
* Fixed adding meek_lite bridges with a domain that contains a hyphen.
6 changes: 6 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/100192.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
**InviZible Pro beta 1.9.2**
* Improved Tor Conjure bridge censorship resistance.
* Improved meek_lite bridge censorship resistance.
* Fixed modules not installed on initial app startup.
* Updated German translation.
* Fixes and optimizations.
3 changes: 3 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/100193.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**InviZible Pro beta 1.9.3**
* Fixed Tor not starting after enabling Allow Tor Tethering.
* Fixes and optimizations.
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ android.enableJetifier=true
# org.gradle.parallel=true
kotlin.code.style=official
kotlin.caching.enabled=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
#org.gradle.unsafe.configuration-cache=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01
19 changes: 10 additions & 9 deletions tordnscrypt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ plugins {
android {
compileSdkVersion 33

namespace 'pan.alexander.tordnscrypt'

flavorDimensions "version", "processor"

productFlavors {

fdroid{
applicationId "pan.alexander.tordnscrypt.stable"
versionName "6.1.0"
versionName "6.2.0"
dimension = 'version'
resValue 'string', 'package_name', applicationId
}
Expand Down Expand Up @@ -54,7 +55,7 @@ android {
defaultConfig {
minSdkVersion 19
targetSdkVersion 33
versionCode 185
versionCode 193

resConfigs "en", "ru", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt", "pt-rBR", "el", "tr", "it"

Expand All @@ -81,8 +82,8 @@ android {
}

compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 17
targetCompatibility = 17
}
buildToolsVersion = '30.0.3'

Expand All @@ -94,6 +95,7 @@ android {

externalNativeBuild {
cmake {
version "3.18.1"
path "CMakeLists.txt"
}
}
Expand All @@ -108,10 +110,9 @@ android {
jniLibs.useLegacyPackaging = true

doNotStrip '*/*/libdnscrypt-proxy.so'
doNotStrip '*/*/libi2pd.so'
doNotStrip '*/*/libobfs4proxy.so'
doNotStrip '*/*/libsnowflake.so'
doNotStrip '*/*/libtor.so'
doNotStrip '*/*/libconjure.so'
}

applicationVariants.all { variant ->
Expand All @@ -130,7 +131,7 @@ android {
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}

}
Expand All @@ -144,7 +145,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
Expand All @@ -155,7 +156,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'eu.chainfire:libsuperuser:1.1.1'
implementation 'com.jrummyapps:android-shell:1.0.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation project(':filepicker')
Expand Down
Binary file added tordnscrypt/libs/arm64-v8a/libc++_shared.so
Binary file not shown.
Binary file added tordnscrypt/libs/arm64-v8a/libconjure.so
Binary file not shown.
Binary file modified tordnscrypt/libs/arm64-v8a/libi2pd.so
Binary file not shown.
Binary file modified tordnscrypt/libs/arm64-v8a/libobfs4proxy.so
Binary file not shown.
Binary file modified tordnscrypt/libs/arm64-v8a/libsnowflake.so
Binary file not shown.
Binary file added tordnscrypt/libs/arm64-v8a/libzmq.so
Binary file not shown.
Binary file added tordnscrypt/libs/armeabi-v7a/libc++_shared.so
Binary file not shown.
Binary file added tordnscrypt/libs/armeabi-v7a/libconjure.so
Binary file not shown.
Binary file modified tordnscrypt/libs/armeabi-v7a/libi2pd.so
Binary file not shown.
Binary file modified tordnscrypt/libs/armeabi-v7a/libobfs4proxy.so
Binary file not shown.
Binary file modified tordnscrypt/libs/armeabi-v7a/libsnowflake.so
Binary file not shown.
Binary file added tordnscrypt/libs/armeabi-v7a/libzmq.so
Binary file not shown.
39 changes: 38 additions & 1 deletion tordnscrypt/libs/build
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ mkdir arm64-v8a armeabi-v7a
# libobfs4proxy #
#################

pushd obfs4/obfs4proxy/
pushd lyrebird/cmd/lyrebird/
go build -ldflags="-s -w" -o libobfs4proxy.so
mv libobfs4proxy.so ${LIBS_ROOT}/${ABI}/libobfs4proxy.so || exit 1
popd
Expand All @@ -73,6 +73,43 @@ go build -ldflags="-s -w" -o libsnowflake.so
mv libsnowflake.so ${LIBS_ROOT}/${ABI}/libsnowflake.so || exit 1
popd

################
# libconjure #
################

pushd libzmq/builds/android/
export NDK_VERSION="android-ndk-r21c"
export ANDROID_NDK_ROOT=$NDK
if [[ $ABI == arm64-v8a ]]
then
#compile arm64-v8a things...
export MIN_SDK_VERSION=21
./build.sh arm64
cp prefix/arm64/lib/libzmq.so ${LIBS_ROOT}/${ABI}/libzmq.so || exit 1
cp prefix/arm64/lib/libc++_shared.so ${LIBS_ROOT}/${ABI}/libc++_shared.so || exit 1
else
#compile armeabi-v7a things...
export MIN_SDK_VERSION=19
./build.sh arm
cp prefix/arm/lib/libzmq.so ${LIBS_ROOT}/${ABI}/libzmq.so || exit 1
cp prefix/arm/lib/libc++_shared.so ${LIBS_ROOT}/${ABI}/libc++_shared.so || exit 1
fi
popd

pushd conjure/client/
if [[ $ABI == arm64-v8a ]]
then
#compile arm64-v8a things...
export CGO_LDFLAGS="-rpath ${LIBS_ROOT}/libzmq/builds/android/prefix/arm64/lib"
export PKG_CONFIG_PATH="${LIBS_ROOT}/libzmq/builds/android/prefix/arm64/lib/pkgconfig"
else
#compile armeabi-v7a things...
export PKG_CONFIG_PATH="${LIBS_ROOT}/libzmq/builds/android/prefix/arm/lib/pkgconfig"
fi
go build -ldflags="-s -w" -o libconjure.so
mv libconjure.so ${LIBS_ROOT}/${ABI}/libconjure.so || exit 1
popd

################
# libnflog #
################
Expand Down
Loading

0 comments on commit f3ad3f5

Please sign in to comment.