backport: 20230402

app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
 
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"

app/src/main/java/io/nekohasekai/sagernet/Constants.kt

@@ -238,5 +238,6 @@ object Action {
     const val SERVICE = "io.nekohasekai.sagernet.SERVICE"
     const val CLOSE = "io.nekohasekai.sagernet.CLOSE"
     const val RELOAD = "io.nekohasekai.sagernet.RELOAD"
-    const val SWITCH_WAKE_LOCK = "io.nekohasekai.sagernet.SWITCH_WAKELOCK"
+    // const val SWITCH_WAKE_LOCK = "io.nekohasekai.sagernet.SWITCH_WAKELOCK"
+    const val RESET_UPSTREAM_CONNECTIONS = "moe.nb4a.RESET_UPSTREAM_CONNECTIONS"
 }

app/src/main/java/io/nekohasekai/sagernet/bg/BaseService.kt

@@ -48,6 +48,7 @@ import libcore.AppStats
 import libcore.Libcore
 import libcore.TrafficListener
 import moe.matsuri.nya.Protocols
+import moe.matsuri.nya.utils.Util
 import java.net.UnknownHostException
 import com.github.shadowsocks.plugin.PluginManager as ShadowsocksPluginPluginManager
 import io.nekohasekai.sagernet.aidl.AppStats as AidlAppStats
@@ -78,11 +79,20 @@ class BaseService {
         var proxy: ProxyInstance? = null
         var notification: ServiceNotification? = null
 
-        val receiver = broadcastReceiver { _, intent ->
+        val receiver = broadcastReceiver { ctx, intent ->
             when (intent.action) {
                 Intent.ACTION_SHUTDOWN -> service.persistStats()
                 Action.RELOAD -> service.forceLoad()
-                Action.SWITCH_WAKE_LOCK -> service.switchWakeLock()
+//                Action.SWITCH_WAKE_LOCK -> service.switchWakeLock()
+                Action.RESET_UPSTREAM_CONNECTIONS -> runOnDefaultDispatcher {
+                    Libcore.resetAllConnections(true)
+                    runOnMainDispatcher {
+                        Util.collapseStatusBar(ctx)
+                        Toast.makeText(ctx, "Reset upstream connections done", Toast.LENGTH_SHORT)
+                            .show()
+                    }
+                }
+
                 else -> service.stopRunner()
             }
         }
@@ -113,8 +123,10 @@ class BaseService {
         // statsListeners: TODO add links
         // bandwidthListeners: only for UI update, don't save data
 
-        private val bandwidthListeners = mutableMapOf<IBinder, Long>()  // the binder is the real identifier
-        private val statsListeners = mutableMapOf<IBinder, Long>()  // the binder is the real identifier
+        private val bandwidthListeners =
+            mutableMapOf<IBinder, Long>()  // the binder is the real identifier
+        private val statsListeners =
+            mutableMapOf<IBinder, Long>()  // the binder is the real identifier
         override val coroutineContext = Dispatchers.Main.immediate + Job()
         private var looper: Job? = null
         private var statsLooper: Job? = null
@@ -196,7 +208,8 @@ class BaseService {
                 val delayMs = statsListeners.values.minOrNull()
                 if (delayMs == 0L) return
                 val queryTime = System.currentTimeMillis()
-                val sinceLastQueryInSeconds = ((queryTime - lastQueryTime).toDouble() / 1000).toLong()
+                val sinceLastQueryInSeconds =
+                    ((queryTime - lastQueryTime).toDouble() / 1000).toLong()
                 lastQueryTime = queryTime
 
                 appStats.clear()
@@ -495,7 +508,7 @@ class BaseService {
                     addAction(Action.RELOAD)
                     addAction(Intent.ACTION_SHUTDOWN)
                     addAction(Action.CLOSE)
-                    addAction(Action.SWITCH_WAKE_LOCK)
+                    addAction(Action.RESET_UPSTREAM_CONNECTIONS)
                 }, "$packageName.SERVICE", null)
                 data.closeReceiverRegistered = true
             }

app/src/main/java/io/nekohasekai/sagernet/bg/ServiceNotification.kt

@@ -56,7 +56,7 @@ import io.nekohasekai.sagernet.utils.Theme
  * See also: https://github.com/aosp-mirror/platform_frameworks_base/commit/070d142993403cc2c42eca808ff3fafcee220ac4
  */
 class ServiceNotification(
-    private val service: BaseService.Interface, profileName: String,
+    private val service: BaseService.Interface, title: String,
     channel: String, visible: Boolean = false,
 ) : BroadcastReceiver() {
     companion object {
@@ -127,7 +127,7 @@ class ServiceNotification(
             }
 
             override fun updateWakeLockStatus(acquired: Boolean) {
-                updateActions(acquired)
+                updateActions()
                 builder.priority =
                     if (acquired) NotificationCompat.PRIORITY_HIGH else NotificationCompat.PRIORITY_LOW
                 update()
@@ -139,7 +139,7 @@ class ServiceNotification(
     private val builder = NotificationCompat.Builder(service as Context, channel)
         .setWhen(0)
         .setTicker(service.getString(R.string.forward_success))
-        .setContentTitle(profileName)
+        .setContentTitle(title)
         .setOnlyAlertOnce(true)
         .setContentIntent(SagerNet.configureIntent(service))
         .setSmallIcon(R.drawable.ic_service_active)
@@ -148,7 +148,7 @@ class ServiceNotification(
 
     init {
         service as Context
-        updateActions(false)
+        updateActions()
 
         Theme.apply(app)
         Theme.apply(service)
@@ -162,41 +162,43 @@ class ServiceNotification(
         show()
     }
 
-    fun updateActions(wakeLockAcquired: Boolean) {
+    private fun updateActions() {
         service as Context
-
         builder.clearActions()
+
         val closeAction = NotificationCompat.Action.Builder(
             0, service.getText(R.string.stop), PendingIntent.getBroadcast(
                 service, 0, Intent(Action.CLOSE).setPackage(service.packageName), flags
             )
-        ).apply {
-            setShowsUserInterface(false)
-        }.build()
+        ).setShowsUserInterface(false).build()
         builder.addAction(closeAction)
 
         val switchAction = NotificationCompat.Action.Builder(
             0, service.getString(R.string.action_switch), PendingIntent.getActivity(
                 service, 0, Intent(service, SwitchActivity::class.java), flags
             )
-        ).apply {
-            setShowsUserInterface(false)
-        }.build()
+        ).setShowsUserInterface(false).build()
         builder.addAction(switchAction)
 
-        val wakeLockAction = NotificationCompat.Action.Builder(
-            0,
-            service.getText(if (!wakeLockAcquired) R.string.acquire_wake_lock else R.string.release_wake_lock),
+        val resetUpstreamAction = NotificationCompat.Action.Builder(
+            0, service.getString(R.string.reset_connections),
             PendingIntent.getBroadcast(
-                service,
-                0,
-                Intent(Action.SWITCH_WAKE_LOCK).setPackage(service.packageName),
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0
+                service, 0, Intent(Action.RESET_UPSTREAM_CONNECTIONS), flags
             )
-        ).apply {
-            setShowsUserInterface(false)
-        }.build()
-        builder.addAction(wakeLockAction)
+        ).setShowsUserInterface(false).build()
+        builder.addAction(resetUpstreamAction)
+
+//        val wakeLockAction = NotificationCompat.Action.Builder(
+//            0,
+//            service.getText(if (!wakeLockAcquired) R.string.acquire_wake_lock else R.string.release_wake_lock),
+//            PendingIntent.getBroadcast(
+//                service,
+//                0,
+//                Intent(Action.SWITCH_WAKE_LOCK).setPackage(service.packageName),
+//                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0
+//            )
+//        ).setShowsUserInterface(false).build()
+//        builder.addAction(wakeLockAction)
     }
 
     override fun onReceive(context: Context, intent: Intent) {

app/src/main/java/moe/matsuri/nya/TempDatabase.kt

@@ -16,7 +16,6 @@ abstract class TempDatabase : RoomDatabase() {
         private val instance by lazy {
             Room.inMemoryDatabaseBuilder(SagerNet.application, TempDatabase::class.java)
                 .allowMainThreadQueries()
-                .enableMultiInstanceInvalidation()
                 .fallbackToDestructiveMigration()
                 .setQueryExecutor { GlobalScope.launch { it.run() } }
                 .build()

app/src/main/java/moe/matsuri/nya/utils/Util.kt

@@ -1,6 +1,7 @@
 package moe.matsuri.nya.utils
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.util.Base64
 import java.io.ByteArrayOutputStream
 import java.text.SimpleDateFormat
@@ -121,4 +122,14 @@ object Util {
         return sdf1.format(Date(t))
     }
 
+    @SuppressLint("WrongConstant")
+    fun collapseStatusBar(context: Context) {
+        try {
+            val statusBarManager = context.getSystemService("statusbar")
+            val collapse = statusBarManager.javaClass.getMethod("collapsePanels")
+            collapse.invoke(statusBarManager)
+        } catch (_: Exception) {
+        }
+    }
+
 }

app/src/main/res/values-zh-rCN/strings.xml

@@ -483,4 +483,5 @@
     <string name="ads">推广</string>
     <string name="share_subscription">分享订阅</string>
     <string name="show_group_in_notification">在通知中显示组名</string>
+    <string name="reset_connections">重置连接</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -523,5 +523,6 @@ Anyone can write advanced plugins, which can control Matsuri. please download an
     <string name="ads">Ads</string>
     <string name="share_subscription">Share Subscription</string>
     <string name="show_group_in_notification">Show group name in in notification</string>
+    <string name="reset_connections">Reset Connections</string>
 
 </resources>