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 · 2020-08-06 20:40:45 +08:00 · 2020-08-06 20:39:08 +08:00
10 changed files with 31 additions and 41 deletions
@@ -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/
@@ -24,7 +24,6 @@ type resolved struct {
 	domain       string
 	IPs          []net.IP
 	Port         int
-	lastResolved time.Time
 	ipIdx        uint8
 	ipLock       sync.Mutex
 	lastSwitched time.Time
@@ -98,7 +97,7 @@ func (d *ProtectedDialer) PrepareResolveChan() {
 	d.resolveChan = make(chan struct{})
 }

-func (d *ProtectedDialer) ResolveChan() chan struct{} {
+func (d *ProtectedDialer) ResolveChan() <-chan struct{} {
 	return d.resolveChan
 }

@@ -138,10 +137,9 @@ func (d *ProtectedDialer) lookupAddr(addr string) (*resolved, error) {
 	}

 	rs := &resolved{
-		domain:       host,
-		IPs:          IPs,
-		Port:         portnum,
-		lastResolved: time.Now(),
+		domain: host,
+		IPs:    IPs,
+		Port:   portnum,
 	}

 	return rs, nil
@@ -152,6 +150,7 @@ func (d *ProtectedDialer) PrepareDomain(domainName string, closeCh <-chan struct
 	log.Printf("Preparing Domain: %s", domainName)
 	d.currentServer = domainName

+	defer close(d.resolveChan)
 	maxRetry := 10
 	for {
 		if maxRetry == 0 {
@@ -213,10 +212,6 @@ func (d *ProtectedDialer) Dial(ctx context.Context,
 			}
 		}

-		if time.Now().Sub(d.vServer.lastResolved) > time.Minute * 30 {
-			d.PrepareDomain(Address, nil)
-		}
-
 		fd, err := d.getFd(dest.Network)
 		if err != nil {
 			return nil, err
@@ -71,10 +71,7 @@ func (v *V2RayPoint) RunLoop() (err error) {
 	if !v.status.IsRunning {
 		v.closeChan = make(chan struct{})
 		v.dialer.PrepareResolveChan()
-		go func() {
-		    v.dialer.PrepareDomain(v.DomainName, v.closeChan)
-		    close(v.dialer.ResolveChan())
-		}()
+		go v.dialer.PrepareDomain(v.DomainName, v.closeChan)
 		go func() {
 			select {
 			// wait until resolved
@@ -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'
    }
-}
+}
@@ -76,7 +76,10 @@

        <activity android:name=".ui.SubEditActivity" />
        <activity android:name=".ui.ScScannerActivity" />
-        <activity android:name=".ui.ScSwitchActivity" />
+        <activity
+            android:name=".ui.ScSwitchActivity"
+            android:excludeFromRecents="true"
+            android:theme="@style/AppTheme.NoActionBar.Translucent" />

        <service
            android:name=".service.V2RayVpnService"
@@ -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
@@ -384,6 +384,7 @@ class V2RayVpnService : VpnService() {
                mBuilder?.setSmallIcon(R.drawable.ic_stat_direct)
            }
            mBuilder?.setStyle(NotificationCompat.BigTextStyle().bigText(contentText))
+            mBuilder?.setContentText(contentText) // Emui4.1 need content text even if style is set as BigTextStyle
            getNotificationManager().notify(NOTIFICATION_ID, mBuilder?.build())
        }
    }
@@ -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
        }
-}
+}
@@ -13,6 +13,12 @@
        <item name="windowNoTitle">true</item>
    </style>

+    <style name="AppTheme.NoActionBar.Translucent">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+
    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />

    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
@@ -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
2dust	3c9c9b5a4c	Merge pull request #531 from yuhan6665/emui-notification Fix notification for Emui 4.1	2020-08-06 20:40:45 +08:00
2dust	e13024d6bb	Merge pull request #526 from Vixb1122/master exclude ScSwitchActivity from recent list	2020-08-06 20:39:08 +08:00
2dust	9d58edd31f	Merge pull request #537 from yuhan6665/revert Revert "Refresh prepared domain every 30 minutes"	2020-08-06 20:38:50 +08:00
yuhan6665	af7dfc3a43	Revert "Refresh prepared domain every 30 minutes" This reverts commit `903352ec9c`.	2020-08-05 20:22:01 -04:00
yuhan6665	ca554e6ac4	Fix notification for Emui 4.1	2020-08-02 08:42:04 -04:00
xuezhixin	ec391d8689	exclude ScSwitchActivity from recent list	2020-07-29 16:47:40 +08:00