Merge branch 'master' into stable

Gedsh · Jun 2, 2024 · 69f8cad · 69f8cad
2 parents 73c0e45 + eb5c9bf
commit 69f8cad
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git 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
@@ -0,0 +1,2 @@
+**InviZible Pro beta 2.2.6**
+* Fixed a crash when using Tor bridges containing only IP and port.
diff --git 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
  }
@@ -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
@@ -34,23 +34,23 @@ 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
  }
 
  pro {
  applicationId "pan.alexander.tordnscrypt.stable"
- versionName "6.7.0"
+ versionName "6.7.1"
  dimension = 'version'
  signingConfig signingConfigs.stablesign
  resValue 'string', 'package_name', applicationId
  }
 
  beta {
  applicationId "pan.alexander.tordnscrypt"
- versionName "2.2.5"
+ versionName "2.2.6"
  dimension = 'version'
  signingConfig signingConfigs.betasign
  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
@@ -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"
 

diff --git a/...t/src/main/java/pan/alexander/tordnscrypt/settings/tor_bridges/PreferencesTorBridges.java b/...t/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 = "";
  }