Merge pull request #544 from yuhan6665/android-system

Add "Android System" in per-app vpn
2020-08-09 12:57:49 +08:00 · 2020-08-08 23:49:06 -04:00 · 2020-08-08 15:35:16 +08:00 · 2020-08-07 21:37:00 -04:00
5 changed files with 14 additions and 26 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,8 @@ V2rayNG/app/src/main/res/layout/activity_inapp_buy.xml
 V2rayNG/app/src/main/assets/geoip.dat
 V2rayNG/app/src/main/assets/geosite.dat
 V2rayNG/app/src/main/java/com/v2ray/ang/InappBuyActivity.java
-V2rayNG/gradle/wrapper/gradle-wrapper.properties
-V2rayNG/gradle/wrapper/gradle-wrapper.properties
 *.dat
 *.jks
-V2rayNG/gradle/wrapper/gradle-wrapper.properties
-V2rayNG/gradle/wrapper/gradle-wrapper.properties
-V2rayNG/app/release/output.json
+V2rayNG/app/release/output.json
+.idea/
+.gradle/
--- a/V2rayNG/app/build.gradle
+++ b/V2rayNG/app/build.gradle
@@ -20,34 +20,17 @@ android {
        versionName "1.0.2"
    }

-    signingConfigs {
-        release {
-            storeFile file("../key.jks")
-            keyAlias 'ang'
-            keyPassword '123456'
-            storePassword '123456'
-        }
-        debug {
-            storeFile file("../key.jks")
-            keyAlias 'ang'
-            keyPassword '123456'
-            storePassword '123456'
-        }
-    }
-
    buildTypes {
        release {
            minifyEnabled false
            zipAlignEnabled false
            shrinkResources false
-            signingConfig signingConfigs.release
 //            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
        debug {
            minifyEnabled false
            zipAlignEnabled false
            shrinkResources false
-            signingConfig signingConfigs.release
        }
    }

@@ -131,4 +114,4 @@ repositories {
    flatDir {
        dirs 'libs'
    }
-}
+}
--- a/V2rayNG/app/src/main/assets/proxy_packagename.txt
+++ b/V2rayNG/app/src/main/assets/proxy_packagename.txt
@@ -1,3 +1,4 @@
+android
 com.android.chrome
 com.google.android.googlequicksearchbox
 com.google.android.apps.photos
@@ -193,4 +194,4 @@ tv.twitch.android.app
 com.shanga.walli
 com.whatsapp
 com.wire
-com.simplehabit.simplehabitapp
+com.simplehabit.simplehabitapp
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AppManagerUtil.kt
@@ -16,7 +16,7 @@ object AppManagerUtil {
        val apps = ArrayList<AppInfo>()

        for (pkg in packages) {
-            if (!pkg.hasInternetPermission) continue
+            if (!pkg.hasInternetPermission && pkg.packageName != "android") continue

            val applicationInfo = pkg.applicationInfo

@@ -40,4 +40,4 @@ object AppManagerUtil {
            val permissions = requestedPermissions
            return permissions?.any { it == Manifest.permission.INTERNET } ?: false
        }
-}
+}
--- a/V2rayNG/gradle/wrapper/gradle-wrapper.properties
+++ b/V2rayNG/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Feb 25 12:40:41 CST 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
Author	SHA1	Message	Date
2dust	20ca554be2	Merge pull request #544 from yuhan6665/android-system Add "Android System" in per-app vpn	2020-08-09 12:57:49 +08:00
yuhan6665	25ba455656	Add "Android System" in per-app vpn	2020-08-08 23:49:06 -04:00
2dust	17e7c62d53	Merge pull request #542 from yuhan6665/master Sanitize project configuration	2020-08-08 15:35:16 +08:00
yuhan6665	6f0f2fdeda	Sanitize project configuration Make project compilable out of box. This commit address the following: - remove release key - fix gitignore for Android Studio temp files - add gradle wrapper properties	2020-08-07 21:37:00 -04:00