From 1daa056e7baaeb21214b846adeefafbf5fdc048e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Wed, 7 Jan 2026 19:43:18 +0800
Subject: [PATCH] Update platform interface usage

---
 .../sfa/bg/PlatformInterfaceWrapper.kt        | 34 ++++---------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sfa/bg/PlatformInterfaceWrapper.kt b/app/src/main/java/io/nekohasekai/sfa/bg/PlatformInterfaceWrapper.kt
index 1455e2a..260b6cd 100644
--- a/app/src/main/java/io/nekohasekai/sfa/bg/PlatformInterfaceWrapper.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/bg/PlatformInterfaceWrapper.kt
@@ -1,13 +1,13 @@
 package io.nekohasekai.sfa.bg
 
 import android.annotation.SuppressLint
-import android.content.pm.PackageManager
 import android.net.NetworkCapabilities
 import android.os.Build
 import android.os.Process
 import android.system.OsConstants
 import android.util.Log
 import androidx.annotation.RequiresApi
+import io.nekohasekai.libbox.ConnectionOwner
 import io.nekohasekai.libbox.InterfaceUpdateListener
 import io.nekohasekai.libbox.Libbox
 import io.nekohasekai.libbox.LocalDNSTransport
@@ -49,7 +49,7 @@ interface PlatformInterfaceWrapper : PlatformInterface {
         sourcePort: Int,
         destinationAddress: String,
         destinationPort: Int,
-    ): Int {
+    ): ConnectionOwner {
         try {
             val uid =
                 Application.connectivity.getConnectionOwnerUid(
@@ -58,7 +58,11 @@ interface PlatformInterfaceWrapper : PlatformInterface {
                     InetSocketAddress(destinationAddress, destinationPort),
                 )
             if (uid == Process.INVALID_UID) error("android: connection owner not found")
-            return uid
+            val packages = Application.packageManager.getPackagesForUid(uid)
+            val owner = ConnectionOwner()
+            owner.userId = uid
+            owner.userName = packages?.firstOrNull() ?: ""
+            return owner
         } catch (e: Exception) {
             Log.e("PlatformInterface", "getConnectionOwnerUid", e)
             e.printStackTrace(System.err)
@@ -66,30 +70,6 @@ interface PlatformInterfaceWrapper : PlatformInterface {
         }
     }
 
-    override fun packageNameByUid(uid: Int): String {
-        val packages = Application.packageManager.getPackagesForUid(uid)
-        if (packages.isNullOrEmpty()) error("android: package not found")
-        return packages[0]
-    }
-
-    @Suppress("DEPRECATION")
-    override fun uidByPackageName(packageName: String): Int {
-        return try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                Application.packageManager.getPackageUid(
-                    packageName,
-                    PackageManager.PackageInfoFlags.of(0),
-                )
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                Application.packageManager.getPackageUid(packageName, 0)
-            } else {
-                Application.packageManager.getApplicationInfo(packageName, 0).uid
-            }
-        } catch (e: PackageManager.NameNotFoundException) {
-            error("android: package not found")
-        }
-    }
-
     override fun startDefaultInterfaceMonitor(listener: InterfaceUpdateListener) {
         DefaultNetworkMonitor.setListener(listener)
     }