Merge branch 'master' into stable

ChangeLog.md

@@ -607,3 +607,34 @@
 * Fixed delayed saving of settings in some cases.
 * Fixed display of warning about arp spoofing attack if app is launched.
 * Minor bug fixes and optimizations.
+
+**InviZible Pro beta 1.3.8**
+* Updated DNSCrypt to version 2.1.1.
+* Added tiles to Android Quick Settings for starting/stopping modules.
+* Preparing the app for Android 12.
+
+**InviZible Pro beta 1.3.9**
+* Fixed crash when opening some settings.
+
+**InviZible Pro beta 1.4.0**
+* Added current connection status to the notification.
+* Optimized application behavior on unstable networks.
+* Improved websites handling for the Tor Exclude/Select websites feature.
+* Improved Android Quick Settings tiles for starting/stopping modules.
+* Improved ARP Spoofing detection.
+* Lots of internal code optimizations.
+
+**InviZible Pro beta 1.4.1**
+* Improved current connection status in the notification.
+* Improved Tor Exclude/Select websites feature.
+* Fixed internet sharing in Root mode on android 11.
+* Fixes and optimizations.
+
+**InviZible Pro beta 1.4.2**
+* Fixed Restore Settings feature.
+* Minor bug fixes and optimizations.
+
+**InviZible Pro beta 1.4.3**
+* Optimized battery usage when network connection is unavailable.
+* Added tile to Android Quick Settings for changing Tor identity.
+* Fixed using Bypass LAN Addresses with socks5 proxy.

build.gradle

@@ -2,8 +2,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.5.30'
-        dagger_version = '2.37'
+        kotlin_version = '1.5.31'
+        dagger_version = '2.40'
         multidex_version = "2.0.1"
     }
 
@@ -13,7 +13,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
 

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

@@ -0,0 +1,4 @@
+**InviZible Pro beta 1.3.8**
+* Updated DNSCrypt to version 2.1.1.
+* Added tiles to Android Quick Settings for starting/stopping modules.
+* Preparing the app for Android 12.

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

@@ -0,0 +1,2 @@
+**InviZible Pro beta 1.3.9**
+* Fixed crash when opening some settings.

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

@@ -0,0 +1,7 @@
+**InviZible Pro beta 1.4.0**
+* Added current connection status to the notification.
+* Optimized application behavior on unstable networks.
+* Improved websites handling for the Tor Exclude/Select websites feature.
+* Improved Android Quick Settings tiles for starting/stopping modules.
+* Improved ARP Spoofing detection.
+* Lots of internal code optimizations.

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

@@ -0,0 +1,5 @@
+**InviZible Pro beta 1.4.1**
+* Improved current connection status in the notification.
+* Improved Tor Exclude/Select websites feature.
+* Fixed internet sharing in Root mode on android 11.
+* Fixes and optimizations.

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

@@ -0,0 +1,3 @@
+**InviZible Pro beta 1.4.2**
+* Fixed Restore Settings feature.
+* Minor bug fixes and optimizations.

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

@@ -0,0 +1,4 @@
+**InviZible Pro beta 1.4.3**
+* Optimized battery usage when network connection is unavailable.
+* Added tile to Android Quick Settings for changing Tor identity.
+* Fixed using Bypass LAN Addresses with socks5 proxy.

tordnscrypt/build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
 
     flavorDimensions "version", "processor"
@@ -14,7 +14,7 @@ android {
 
         fdroid{
             applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "5.4.0"
+            versionName "5.5.0"
             dimension = 'version'
             resValue 'string', 'package_name', applicationId
         }
@@ -53,10 +53,10 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 30
-        versionCode 137
+        targetSdkVersion 31
+        versionCode 143
 
-        resConfigs "en", "ru-rRU", "ru-rUA", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt-rBR"
+        resConfigs "en", "ru", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt-rBR"
 
         externalNativeBuild {
             cmake {
@@ -141,16 +141,18 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.lifecycle:lifecycle-process:2.4.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     //noinspection GradleDynamicVersion
     implementation 'eu.chainfire:libsuperuser:1.1.0.+'
     implementation 'com.jrummyapps:android-shell:1.0.1'
-    implementation "androidx.core:core-ktx:1.6.0"
+    implementation "androidx.core:core-ktx:1.7.0"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation project(':filepicker')
 

tordnscrypt/libs/prebuild

@@ -3,7 +3,7 @@
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
 obfs4proxy_version=f638c33f6c6f697498150d5f0dfbf26453759262
-dnscryptproxy_version=2.1.0
+dnscryptproxy_version=2.1.1
 snowflake_version=v1.1.0
 tor_openssl_version=OpenSSL_1_1_1k
 libevent_version=release-2.1.12-stable

tordnscrypt/owner.gradle

@@ -9,7 +9,7 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
 
     flavorDimensions "version", "processor"
@@ -33,23 +33,23 @@ android {
     productFlavors {
         lite {
             applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "5.4.0"
+            versionName "5.5.0"
             dimension = 'version'
             signingConfig signingConfigs.stablesign
             resValue 'string', 'package_name', applicationId
         }
 
         pro {
             applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "5.4.0"
+            versionName "5.5.0"
             dimension = 'version'
             signingConfig signingConfigs.stablesign
             resValue 'string', 'package_name', applicationId
         }
 
         beta {
             applicationId "pan.alexander.tordnscrypt"
-            versionName "1.3.7"
+            versionName "1.4.3"
             dimension = 'version'
             signingConfig signingConfigs.betasign
             resValue 'string', 'package_name', applicationId
@@ -58,7 +58,7 @@ android {
         google_play {
             minSdkVersion 22
             applicationId "pan.alexander.tordnscrypt.gp"
-            versionName "5.4.0"
+            versionName "5.5.0"
             dimension = 'version'
             signingConfig signingConfigs.stablesign
             resValue 'string', 'package_name', applicationId
@@ -89,10 +89,10 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 30
-        versionCode 137
+        targetSdkVersion 31
+        versionCode 143
 
-        resConfigs "en", "ru-rRU", "ru-rUA", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt-rBR"
+        resConfigs "en", "ru", "pl", "de", "fa", "fi", "in", "fr", "ja", "zh", "es", "pt-rBR"
 
         externalNativeBuild {
             cmake {
@@ -180,21 +180,24 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    //implementation 'androidx.appcompat:appcompat:1.4.0-rc01' Android Emoji Policy February 2
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.lifecycle:lifecycle-process:2.4.0'
     google_playImplementation 'com.android.billingclient:billing:4.0.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     //noinspection GradleDynamicVersion
     implementation 'eu.chainfire:libsuperuser:1.1.0.+'
     implementation 'com.jrummyapps:android-shell:1.0.1'
-    implementation "androidx.core:core-ktx:1.6.0"
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1'
     implementation project(':filepicker')
 
     //DI

tordnscrypt/src/fdroid/AndroidManifest.xml

@@ -68,29 +68,95 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="q">
 
+        <service
+            android:name=".tiles.TorTileService"
+            android:enabled="true"
+            android:exported="true"
+            android:icon="@drawable/ic_tor_tile"
+            android:label="Tor"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                android:value="true" />
+        </service>
+
+        <service
+            android:name=".tiles.DNSCryptTileService"
+            android:enabled="true"
+            android:exported="true"
+            android:icon="@drawable/ic_dns_tile"
+            android:label="DNSCrypt"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                android:value="true" />
+        </service>
+
+        <service
+            android:name=".tiles.ITPDTileService"
+            android:enabled="true"
+            android:exported="true"
+            android:icon="@drawable/ic_i2p_tile"
+            android:label="Purple I2P"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                android:value="true" />
+        </service>
+
+        <service
+            android:name=".tiles.ChangeTorIpTileService"
+            android:enabled="true"
+            android:exported="true"
+            android:icon="@drawable/ic_ip_tile"
+            android:label="@string/tile_change_tor_ip"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                android:value="true" />
+        </service>
+
         <service
             android:name=".utils.appexit.AppExitDetectService"
             android:enabled="true"
             android:exported="false"
             android:stopWithTask="true" />
+
         <service
             android:name=".update.UpdateService"
             android:enabled="true"
-            android:exported="false" />
+            android:exported="false"
+            android:foregroundServiceType="dataSync" />
 
         <activity android:name=".help.HelpActivity" />
 
         <service
             android:name=".utils.root.RootExecService"
             android:enabled="true"
-            android:exported="false" />
+            android:exported="false"
+            android:foregroundServiceType="mediaPlayback" />
+
         <service
             android:name=".modules.ModulesService"
             android:enabled="true"
-            android:exported="false" />
+            android:exported="false"
+            android:foregroundServiceType="mediaPlayback" />
 
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/main_activity_label"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
@@ -112,11 +178,15 @@
                     android:host="invizible.net"
                     android:scheme="http" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
+            </intent-filter>
         </activity>
 
         <receiver
             android:name=".BootCompleteReceiver"
-            android:enabled="true">
+            android:enabled="true"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
@@ -135,19 +205,24 @@
         <activity
             android:name=".backup.BackupActivity"
             android:theme="@style/AppTheme" />
+
         <activity
-            android:name=".SettingsActivity"
+            android:name=".settings.SettingsActivity"
             android:label="@string/empty_string"
             android:theme="@style/AppTheme" />
-        <activity android:name=".AboutActivity" />
+        <activity android:name=".about.AboutActivity" />
 
         <service
             android:name=".utils.web.GetIPsJobService"
             android:enabled="true"
             android:exported="true"
+            android:foregroundServiceType="dataSync"
             android:permission="android.permission.BIND_JOB_SERVICE" />
+
         <service
             android:name=".vpn.service.ServiceVPN"
+            android:exported="true"
+            android:foregroundServiceType="dataSync"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>