Merge pull request #219 from solrudev/develop

0.25.4

Author: solrudev

ackpine-plugins/privileged/src/main/kotlin/ru/solrudev/ackpine/privileged/PackageInstallerProxy.kt

@@ -56,7 +56,7 @@ public abstract class PackageInstallerProxy protected constructor(
 
 	private val installParameters = ConcurrentHashMap<UUID, PrivilegedInstallParameters>()
 	private val uninstallParameters = ConcurrentHashMap<UUID, PrivilegedUninstallParameters>()
-	private val packageInstallers = ConcurrentHashMap<Int, PackageInstaller>()
+	private val packageInstallers = ConcurrentHashMap<PackageInstallerKey, PackageInstaller>()
 	private val packageInstallerLocks = Locks(16)
 
 	final override fun bind(sessionId: UUID): PackageInstallerService {
@@ -71,7 +71,8 @@ public abstract class PackageInstallerProxy protected constructor(
 		} else {
 			targetUser.userId
 		}
-		val packageInstaller = packageInstallers.computeIfAbsentCompat(resolvedUserId, packageInstallerLocks) {
+		val key = PackageInstallerKey(resolvedUserId, installerPackageName)
+		val packageInstaller = packageInstallers.computeIfAbsentCompat(key, packageInstallerLocks) {
 			createPackageInstaller(context, remotePackageInstaller, installerPackageName, resolvedUserId)
 		}
 		return BoundPackageInstaller(packageInstaller!!, resolvedUserId, installerPackageName)
@@ -113,6 +114,8 @@ public abstract class PackageInstallerProxy protected constructor(
 		"PackageInstallerService must be bound to an Ackpine session before use"
 	)
 
+	private data class PackageInstallerKey(val userId: Int, val installerPackageName: String)
+
 	private inner class BoundPackageInstaller(
 		private val packageInstaller: PackageInstaller,
 		private val userId: Int,

docs/changelog.md

@@ -6,6 +6,13 @@ hide:
 Change Log
 ==========
 
+Version 0.25.4 (2026-07-30)
+---------------------------
+
+### Bug fixes and improvements
+
+- Fix incorrect installer package name applied to a session when the same target user was already used with privileged plugins.
+
 Version 0.25.3 (2026-07-29)
 ---------------------------
 

version.json

@@ -1,7 +1,7 @@
 {
   "majorVersion": 0,
   "minorVersion": 25,
-  "patchVersion": 3,
+  "patchVersion": 4,
   "suffix": "",
   "isSnapshot": false
 }