From 022ee9ccb6eff90ae981a9f05d674c13b9b06b36 Mon Sep 17 00:00:00 2001 From: Oleksandr Garmatin Date: Sat, 1 Jun 2024 12:15:02 +0300 Subject: [PATCH 1/4] fix: fix a crash when using bridges containing only IP --- .../settings/tor_bridges/PreferencesTorBridges.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tordnscrypt/src/main/java/pan/alexander/tordnscrypt/settings/tor_bridges/PreferencesTorBridges.java b/tordnscrypt/src/main/java/pan/alexander/tordnscrypt/settings/tor_bridges/PreferencesTorBridges.java index 996724e9..2118c5a4 100644 --- a/tordnscrypt/src/main/java/pan/alexander/tordnscrypt/settings/tor_bridges/PreferencesTorBridges.java +++ b/tordnscrypt/src/main/java/pan/alexander/tordnscrypt/settings/tor_bridges/PreferencesTorBridges.java @@ -489,7 +489,11 @@ private boolean isFascistFirewallShouldBeDisabled() { Matcher matcher = pattern.matcher(currentBridge); String ip; if (matcher.find()) { - ip = matcher.group().substring(0, matcher.group().lastIndexOf(" ")); + if (matcher.group().lastIndexOf(" ") >= 0) { + ip = matcher.group().substring(0, matcher.group().lastIndexOf(" ")); + } else { + ip = matcher.group(); + } } else { ip = ""; } From 0b06c1616ecfa396081ee67aa12b811d4fae7e83 Mon Sep 17 00:00:00 2001 From: Oleksandr Garmatin Date: Sat, 1 Jun 2024 12:20:35 +0300 Subject: [PATCH 2/4] bump: bump beta version to 2.2.6 --- tordnscrypt/build.gradle | 2 +- tordnscrypt/owner.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tordnscrypt/build.gradle b/tordnscrypt/build.gradle index 1a53d36a..51602ad8 100644 --- a/tordnscrypt/build.gradle +++ b/tordnscrypt/build.gradle @@ -55,7 +55,7 @@ android { defaultConfig { minSdkVersion 19 targetSdkVersion 33 - versionCode 225 + versionCode 226 resConfigs "en", "ru", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt", "pt-rBR", "el", "tr", "it", "uk" diff --git a/tordnscrypt/owner.gradle b/tordnscrypt/owner.gradle index 68571191..251c60f1 100644 --- a/tordnscrypt/owner.gradle +++ b/tordnscrypt/owner.gradle @@ -50,7 +50,7 @@ android { beta { applicationId "pan.alexander.tordnscrypt" - versionName "2.2.5" + versionName "2.2.6" dimension = 'version' signingConfig signingConfigs.betasign resValue 'string', 'package_name', applicationId @@ -91,7 +91,7 @@ android { defaultConfig { minSdkVersion 19 targetSdkVersion 33 - versionCode 225 + versionCode 226 resConfigs "en", "ru", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt", "pt-rBR", "el", "tr", "it", "uk" From 53e462a1f02eea8bef81f19642275448a2e42b30 Mon Sep 17 00:00:00 2001 From: Oleksandr Garmatin Date: Sat, 1 Jun 2024 13:34:59 +0300 Subject: [PATCH 3/4] release: update changelog for 2.2.6-beta --- ChangeLog.md | 3 +++ fastlane/metadata/android/en-US/changelogs/100226.txt | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/100226.txt diff --git a/ChangeLog.md b/ChangeLog.md index 67deb299..ea668c7b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1147,3 +1147,6 @@ * Updated Tor Lyrebird obfuscating proxy. * Updated Chinese and Persian translations. * Fixes and optimizations. + +**InviZible Pro beta 2.2.6** +* Fixed a crash when using Tor bridges containing only IP and port. diff --git a/fastlane/metadata/android/en-US/changelogs/100226.txt b/fastlane/metadata/android/en-US/changelogs/100226.txt new file mode 100644 index 00000000..aa4328ae --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/100226.txt @@ -0,0 +1,2 @@ +**InviZible Pro beta 2.2.6** +* Fixed a crash when using Tor bridges containing only IP and port. From eb5c9bfef386c70bb028bd41281cece0c6610799 Mon Sep 17 00:00:00 2001 From: Oleksandr Garmatin Date: Sun, 2 Jun 2024 13:40:03 +0300 Subject: [PATCH 4/4] release: bump stable version to 6.7.1 --- tordnscrypt/build.gradle | 2 +- tordnscrypt/owner.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tordnscrypt/build.gradle b/tordnscrypt/build.gradle index 51602ad8..0ead8e4c 100644 --- a/tordnscrypt/build.gradle +++ b/tordnscrypt/build.gradle @@ -15,7 +15,7 @@ android { fdroid{ applicationId "pan.alexander.tordnscrypt.stable" - versionName "6.7.0" + versionName "6.7.1" dimension = 'version' resValue 'string', 'package_name', applicationId } diff --git a/tordnscrypt/owner.gradle b/tordnscrypt/owner.gradle index 251c60f1..ee13d726 100644 --- a/tordnscrypt/owner.gradle +++ b/tordnscrypt/owner.gradle @@ -34,7 +34,7 @@ android { productFlavors { lite { applicationId "pan.alexander.tordnscrypt.stable" - versionName "6.7.0" + versionName "6.7.1" dimension = 'version' signingConfig signingConfigs.stablesign resValue 'string', 'package_name', applicationId @@ -42,7 +42,7 @@ android { pro { applicationId "pan.alexander.tordnscrypt.stable" - versionName "6.7.0" + versionName "6.7.1" dimension = 'version' signingConfig signingConfigs.stablesign resValue 'string', 'package_name', applicationId @@ -59,7 +59,7 @@ android { google_play { minSdkVersion 22 applicationId "pan.alexander.tordnscrypt.gp" - versionName "6.7.0" + versionName "6.7.1" dimension = 'version' signingConfig signingConfigs.stablesign resValue 'string', 'package_name', applicationId