Merge branch 'dev' into android_shadowsocks

This commit is contained in:
pokamest 2022-08-09 17:11:11 +03:00 committed by GitHub
commit fd9b922b21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2131 changed files with 396646 additions and 946 deletions

View file

@ -7,7 +7,9 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<!-- Enable when VPN-per-app mode will be implemented -->
<!-- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> -->
<uses-permission android:name="android.permission.CAMERA"/>
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.

View file

@ -115,8 +115,8 @@ android {
resConfig "en"
minSdkVersion = 24
targetSdkVersion = 30
versionCode 8 // Change to a higher number
versionName "2.0.8" // Change to a higher number
versionCode 10 // Change to a higher number
versionName "2.0.10" // Change to a higher number
javaCompileOptions.annotationProcessorOptions.arguments = [
"room.schemaLocation": "${qt5AndroidDir}/schemas".toString()