From 1144183da48af082f3c162eb989e02bda93b2252 Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Sat, 18 Jul 2020 13:09:53 -0400
Subject: [PATCH] Update notification icon based on traffic

Notification icon would be a good indication for current traffic
- going through proxy
- connect directly
- not going through v2rayNG
---
 .../com/v2ray/ang/service/V2RayVpnService.kt     |  15 ++++++++++++---
 .../app/src/main/res/drawable/ic_stat_direct.png | Bin 0 -> 1915 bytes
 .../app/src/main/res/drawable/ic_stat_proxy.png  | Bin 0 -> 3199 bytes
 .../app/src/main/res/values-zh-rCN/strings.xml   |   2 +-
 .../app/src/main/res/values-zh-rTW/strings.xml   |   2 +-
 V2rayNG/app/src/main/res/values/strings.xml      |   3 ++-
 6 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 V2rayNG/app/src/main/res/drawable/ic_stat_direct.png
 create mode 100644 V2rayNG/app/src/main/res/drawable/ic_stat_proxy.png

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
index 1a1dcebe..7c614210 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayVpnService.kt
@@ -40,6 +40,7 @@ class V2RayVpnService : VpnService() {
         const val NOTIFICATION_ID = 1
         const val NOTIFICATION_PENDING_INTENT_CONTENT = 0
         const val NOTIFICATION_PENDING_INTENT_STOP_V2RAY = 1
+        const val NOTIFICATION_ICON_THRESHOLD = 3000
 
         fun startV2Ray(context: Context) {
             val intent = Intent(context.applicationContext, V2RayVpnService::class.java)
@@ -359,8 +360,15 @@ class V2RayVpnService : VpnService() {
         mSubscription = null
     }
 
-    private fun updateNotification(contentText: String) {
+    private fun updateNotification(contentText: String, proxyTraffic: Long, directTraffic: Long) {
         if (mBuilder != null) {
+            if (proxyTraffic < NOTIFICATION_ICON_THRESHOLD && directTraffic < NOTIFICATION_ICON_THRESHOLD) {
+                mBuilder?.setSmallIcon(R.drawable.ic_v)
+            } else if (proxyTraffic > directTraffic) {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_proxy)
+            } else {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_direct)
+            }
             mBuilder?.setStyle(NotificationCompat.BigTextStyle().bigText(contentText))
             getNotificationManager().notify(NOTIFICATION_ID, mBuilder?.build())
         }
@@ -393,7 +401,8 @@ class V2RayVpnService : VpnService() {
                             updateNotification("proxy\t•  ${(proxyUplink / sinceLastQueryInSeconds).toLong().toSpeedString()}↑  " +
                                     "${(proxyDownlink / sinceLastQueryInSeconds).toLong().toSpeedString()}↓\n" +
                                     "direct\t•  ${(directUplink / sinceLastQueryInSeconds).toLong().toSpeedString()}↑  " +
-                                    "${(directDownlink / sinceLastQueryInSeconds).toLong().toSpeedString()}↓")
+                                    "${(directDownlink / sinceLastQueryInSeconds).toLong().toSpeedString()}↓",
+                                    proxyDownlink + proxyUplink, directDownlink + directUplink)
                         }
                         last_zero_speed = zero_speed
                         lastQueryTime = queryTime
@@ -408,7 +417,7 @@ class V2RayVpnService : VpnService() {
             mSubscription = null
 
             val cf_name = defaultDPreference.getPrefString(AppConfig.PREF_CURR_CONFIG_NAME, "")
-            updateNotification(cf_name)
+            updateNotification(cf_name, 0, 0)
         }
     }
 
diff --git a/V2rayNG/app/src/main/res/drawable/ic_stat_direct.png b/V2rayNG/app/src/main/res/drawable/ic_stat_direct.png
new file mode 100644
index 0000000000000000000000000000000000000000..406a0c76906cc821cc56ddfa2f6176b32eb5736a
GIT binary patch
literal 1915
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
S#ak@?nOrY_&x`JnhyDjG=r0EV

literal 0
HcmV?d00001

diff --git a/V2rayNG/app/src/main/res/drawable/ic_stat_proxy.png b/V2rayNG/app/src/main/res/drawable/ic_stat_proxy.png
new file mode 100644
index 0000000000000000000000000000000000000000..daef597015daf9af35b0e84ef02d80d4a7fe9fba
GIT binary patch
literal 3199
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
G>VE)|)VRF>

literal 0
HcmV?d00001

diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
index 535748f3..3b0079fb 100644
--- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@@ -83,7 +83,7 @@
     <string name="summary_pref_mux_enabled">开启可能会加速,关闭可能会减少断流</string>
 
     <string name="title_pref_speed_enabled">启用速度显示</string>
-    <string name="summary_pref_speed_enabled">在通知中显示当前速度</string>
+    <string name="summary_pref_speed_enabled">在通知中显示当前速度\n小图标显示流量的路由情况</string>
 
     <string name="title_pref_sniffing_enabled">启用流量探测</string>
     <string name="summary_pref_sniffing_enabled">流量探测</string>
diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
index fde2fb1e..452be54d 100644
--- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@@ -84,7 +84,7 @@
     <string name="summary_pref_mux_enabled">啟用或許會加快網路速度，切換或許會閃爍</string>
 
     <string name="title_pref_speed_enabled">啟用速度顯示</string>
-    <string name="summary_pref_speed_enabled">在通知中顯示當前速度</string>
+    <string name="summary_pref_speed_enabled">在通知中顯示當前速度\n小圖標顯示流量的路由情況</string>
 
     <string name="title_pref_sniffing_enabled">啟用流量探測</string>
     <string name="summary_pref_sniffing_enabled">流量探測</string>
diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml
index 6865872a..76a6e653 100644
--- a/V2rayNG/app/src/main/res/values/strings.xml
+++ b/V2rayNG/app/src/main/res/values/strings.xml
@@ -84,7 +84,8 @@
     <string name="summary_pref_mux_enabled">Enable maybe speed up network and switch network maybe flash</string>
 
     <string name="title_pref_speed_enabled">Enable speed display</string>
-    <string name="summary_pref_speed_enabled">Display current speed in the notification</string>
+    <string name="summary_pref_speed_enabled">Display current speed in the notification.\nNotification icon would change based on
+        usage.</string>
 
     <string name="title_pref_sniffing_enabled">Enable Sniffing</string>
     <string name="summary_pref_sniffing_enabled">Sniffing</string>