update

hiddify · Apr 30, 2023 · ec1e2a3 · ec1e2a3
1 parent c42292c
commit ec1e2a3
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 2 deletions.
diff --git a/V2rayNG/app/libs/libv2ray.aar b/V2rayNG/app/libs/libv2ray.aar
diff --git a/V2rayNG/app/release/output-metadata.json b/V2rayNG/app/release/output-metadata.json
@@ -0,0 +1,72 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "ang.hiddify.com",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "UNIVERSAL",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 5100104,
+ "versionName": "1.01.4",
+ "outputFile": "HiddifyNG_null.apk"
+ },
+ {
+ "type": "ONE_OF_MANY",
+ "filters": [
+ {
+ "filterType": "ABI",
+ "value": "armeabi-v7a"
+ }
+ ],
+ "attributes": [],
+ "versionCode": 6100104,
+ "versionName": "1.01.4",
+ "outputFile": "HiddifyNG_armeabi-v7a.apk"
+ },
+ {
+ "type": "ONE_OF_MANY",
+ "filters": [
+ {
+ "filterType": "ABI",
+ "value": "x86_64"
+ }
+ ],
+ "attributes": [],
+ "versionCode": 9100104,
+ "versionName": "1.01.4",
+ "outputFile": "HiddifyNG_x86_64.apk"
+ },
+ {
+ "type": "ONE_OF_MANY",
+ "filters": [
+ {
+ "filterType": "ABI",
+ "value": "x86"
+ }
+ ],
+ "attributes": [],
+ "versionCode": 8100104,
+ "versionName": "1.01.4",
+ "outputFile": "HiddifyNG_x86.apk"
+ },
+ {
+ "type": "ONE_OF_MANY",
+ "filters": [
+ {
+ "filterType": "ABI",
+ "value": "arm64-v8a"
+ }
+ ],
+ "attributes": [],
+ "versionCode": 7100104,
+ "versionName": "1.01.4",
+ "outputFile": "HiddifyNG_arm64-v8a.apk"
+ }
+ ],
+ "elementType": "File"
+}
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/HiddifyMainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/HiddifyMainActivity.kt
@@ -4,6 +4,7 @@ import android.Manifest
 import android.content.*
 import android.content.res.ColorStateList
 import android.net.Uri
+import android.net.VpnService
 import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
@@ -108,7 +109,14 @@ class HiddifyMainActivity : BaseActivity(), /*NavigationView.OnNavigationItemSel
  binding.startButtonIcon.click {
  if (hiddifyMainViewModel.isRunning.value == true) {
  Utils.stopVService(this)
- }else {
+ } else if (settingsStorage?.decodeString(AppConfig.PREF_MODE) ?: "VPN" == "VPN") {
+ val intent = VpnService.prepare(this)
+ if (intent == null) {
+ startV2Ray()
+ } else {
+ requestVpnPermission.launch(intent)
+ }
+ } else {
  startV2Ray()
  }
  }

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
@@ -377,7 +377,7 @@ object Utils {
 
  fun getLocale(context: Context): Locale =
  when (settingsStorage?.decodeString(AppConfig.PREF_LANGUAGE) ?: "auto") {
- "auto" -> Locale("fa")//getSysLocale()
+ "auto" -> getSysLocale()
  "en" -> Locale("en")
  "zh-rCN" -> Locale("zh", "CN")
  "zh-rTW" -> Locale("zh", "TW")

diff --git a/screenshots/p1.png b/screenshots/p1.png
diff --git a/screenshots/p2.png b/screenshots/p2.png
diff --git a/screenshots/p3.png b/screenshots/p3.png
diff --git a/screenshots/p4.png b/screenshots/p4.png
diff --git a/screenshots/p5.png b/screenshots/p5.png
diff --git a/screenshots/p6.png b/screenshots/p6.png
diff --git a/screenshots/p7.png b/screenshots/p7.png
diff --git a/screenshots/p8.png b/screenshots/p8.png
diff --git a/screenshots/t10.png b/screenshots/t10.png
diff --git a/screenshots/t7.png b/screenshots/t7.png