Merge branches 'feature/v2ray' and 'feature/v2ray-lite' of github.com…

…:ivpn/android-app into feature/v2ray-lite

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://git.zx2c4.com/wireguard-tools
 [submodule "core/src/main/cpp/openvpn"]
 	path = core/src/main/cpp/openvpn
-	url = https://github.com/schwabe/openvpn
+	url = https://github.com/ivpn/android-openvpn
 [submodule "core/src/main/cpp/openssl"]
 	path = core/src/main/cpp/openssl
 	url = https://github.com/schwabe/platform_external_openssl

ACKNOWLEDGEMENTS.md

@@ -1054,31 +1054,6 @@ THE SOFTWARE.
    limitations under the License.
 
 
-## sentry-android
-
-MIT License
-
-Copyright (c) 2019 Sentry
-Copyright (c) 2015 Salomon BRYS for Android ANRWatchDog
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 
 ## slf4j
 

CHANGELOG.md

@@ -2,6 +2,45 @@
 
 All notable changes to this project will be documented in this file.
 
+## Version 2.10.10 - 2024-08-20
+
+[FIXED] Crash when using Network Protection  
+[FIXED] Crash when using the Update button  
+[FIXED] Connect VPN using the Quick Settings tile  
+[NOTE] Removed option to report crash logs with Sentry  
+
+[Download IVPN Client v2.10.10](https://www.ivpn.net/releases/android/IVPNv2.10.10site.apk)  
+SHA256: 484ede3adabda94bc78768d3f3b1dc12732cbb76eb886216bc693850a469f5fe 
+
+## Version 2.10.9 - 2024-08-08
+
+[IMPROVED] Target Android API level 34  
+[FIXED] 2FA login not working when session limit is reached  
+
+[Download IVPN Client v2.10.9](https://www.ivpn.net/releases/android/IVPNv2.10.9site.apk)  
+SHA256: cd68f954ec349277bec818988c57494a7f64f4447d0c5804607c95977a1b1db2  
+
+## Version 2.10.8 - 2024-06-03
+
+[IMPROVED] Post-Quantum library updated to the latest version  
+[IMPROVED] Support for pending payments  
+[NOTE] Removed support for Android 7.0 and older  
+
+[Download IVPN Client v2.10.8](https://www.ivpn.net/releases/android/IVPNv2.10.8site.apk)  
+SHA256: 5f3de49a59b80f06087f440d3e7d939d2f815d7ba944a1a75c90a20e447865cd  
+
+## Version 2.10.7 - 2024-02-12
+
+[NEW] Device Management  
+[IMPROVED] Increased timeout for API requests  
+
+[Download IVPN Client v2.10.7](https://www.ivpn.net/releases/android/IVPNv2.10.7site.apk)  
+SHA256: e091ee87d73eda39036854ca02be2c0451502730043fe39a8242403124965ceb  
+
+## Version 2.10.6 - 2023-12-18
+
+[FIXED] Crash when opening the app on F-Droid  
+
 ## Version 2.10.5 - 2023-12-13
 
 [IMPROVED] Show non-launchable and system apps in the Split Tunneling list  

README.md

@@ -42,7 +42,6 @@ Project dependencies:
 * [retrofit2](https://github.com/square/retrofit)
 * [gson](https://github.com/google/gson)
 * [streamsupport](https://github.com/streamsupport/streamsupport)
-* [sentry-android](https://github.com/getsentry/sentry-java)
 * [slf4j](https://github.com/qos-ch/slf4j)
 * [logback-android](https://github.com/tony19/logback-android)
 * [mockito](https://github.com/mockito/mockito)

build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext.kotlin_version = '1.8.0'
     ext.kotlin_coroutines_version = '1.2.1'
-    ext.nav_version = '2.5.0'
+    ext.nav_version = '2.5.3'
     ext.compose_version = '1.4.1'
     ext.dagger_version = '2.44'
     repositories {

core/build.gradle

@@ -26,12 +26,12 @@ android {
         }
     }
 
-    compileSdkVersion 33
+    compileSdkVersion 34
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 33
-        versionCode 128
-        versionName "2.10.5"
+        minSdkVersion 23
+        targetSdkVersion 34
+        versionCode 135
+        versionName "2.10.10"
         ndkVersion "25.1.8937393"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -289,8 +289,6 @@ dependencies {
     // V2Ray
     implementation project(path: ':v2ray')
 
-    // For crash logging.
-    implementation 'io.sentry:sentry-android:4.3.0'
     implementation "androidx.multidex:multidex:2.0.1"
 }