diff --git a/app/src/main/java/com/aurora/store/data/installer/AMInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/AMInstaller.kt
index 2a72a447c..219cd95c9 100644
--- a/app/src/main/java/com/aurora/store/data/installer/AMInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/AMInstaller.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.util.Log
 import com.aurora.store.R
+import com.aurora.store.data.installer.base.InstallerBase
 import com.aurora.store.data.model.InstallerInfo
 import com.aurora.store.data.room.download.Download
 import com.aurora.store.util.PackageUtil.isSharedLibraryInstalled
@@ -17,7 +18,7 @@ import javax.inject.Singleton
 
 @Singleton
 class AMInstaller @Inject constructor(
-    @ApplicationContext context: Context
+    @ApplicationContext private val context: Context
 ) : InstallerBase(context) {
 
     companion object {
diff --git a/app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt
index 49ff9e130..0c8a51c58 100644
--- a/app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt
@@ -36,6 +36,7 @@ import com.aurora.extensions.isPAndAbove
 import com.aurora.extensions.isSAndAbove
 import com.aurora.store.BuildConfig
 import com.aurora.store.R
+import com.aurora.store.data.installer.base.IInstaller
 import com.aurora.store.data.model.Installer
 import com.aurora.store.data.model.InstallerInfo
 import com.aurora.store.util.NotificationUtil
diff --git a/app/src/main/java/com/aurora/store/data/installer/NativeInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/NativeInstaller.kt
index 997149189..ebf38685c 100644
--- a/app/src/main/java/com/aurora/store/data/installer/NativeInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/NativeInstaller.kt
@@ -26,6 +26,7 @@ import android.os.Build
 import android.util.Log
 import com.aurora.extensions.runOnUiThread
 import com.aurora.store.R
+import com.aurora.store.data.installer.base.InstallerBase
 import com.aurora.store.data.model.InstallerInfo
 import com.aurora.store.data.room.download.Download
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -36,7 +37,7 @@ import javax.inject.Singleton
 @Singleton
 @Deprecated("Deprecated in favour of SessionInstaller")
 class NativeInstaller @Inject constructor(
-    @ApplicationContext context: Context
+    @ApplicationContext private val context: Context
 ) : InstallerBase(context) {
 
     companion object {
diff --git a/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
index 9d602deaf..08f145677 100644
--- a/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
@@ -24,6 +24,7 @@ import android.util.Log
 import com.aurora.store.AuroraApp
 import com.aurora.store.R
 import com.aurora.store.data.event.InstallerEvent
+import com.aurora.store.data.installer.base.InstallerBase
 import com.aurora.store.data.model.InstallerInfo
 import com.aurora.store.data.room.download.Download
 import com.aurora.store.util.PackageUtil.isSharedLibraryInstalled
@@ -35,7 +36,7 @@ import javax.inject.Singleton
 
 @Singleton
 class RootInstaller @Inject constructor(
-    @ApplicationContext context: Context
+    @ApplicationContext private val context: Context
 ) : InstallerBase(context) {
 
     companion object {
diff --git a/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt
index 3ab9f9bcc..0257bb717 100644
--- a/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt
@@ -30,18 +30,17 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.RemoteException
 import android.util.Log
-import androidx.core.content.FileProvider
 import com.aurora.services.IPrivilegedCallback
 import com.aurora.services.IPrivilegedService
 import com.aurora.store.AuroraApp
 import com.aurora.store.BuildConfig
 import com.aurora.store.R
 import com.aurora.store.data.event.InstallerEvent
+import com.aurora.store.data.installer.base.InstallerBase
 import com.aurora.store.data.model.InstallerInfo
 import com.aurora.store.data.room.download.Download
 import com.aurora.store.util.PackageUtil
 import dagger.hilt.android.qualifiers.ApplicationContext
-import java.io.File
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.ThreadPoolExecutor
 import java.util.concurrent.TimeUnit
@@ -52,7 +51,7 @@ import javax.inject.Singleton
 @Singleton
 @Deprecated("Deprecated in favour of RootInstaller")
 class ServiceInstaller @Inject constructor(
-    @ApplicationContext context: Context
+    @ApplicationContext private val context: Context
 ) : InstallerBase(context) {
 
     private lateinit var serviceConnection: ServiceConnection
diff --git a/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt
index ddf17e448..9945942e6 100644
--- a/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt
@@ -44,6 +44,7 @@ import com.aurora.store.data.installer.AppInstaller.Companion.ACTION_INSTALL_STA
 import com.aurora.store.data.installer.AppInstaller.Companion.EXTRA_DISPLAY_NAME
 import com.aurora.store.data.installer.AppInstaller.Companion.EXTRA_PACKAGE_NAME
 import com.aurora.store.data.installer.AppInstaller.Companion.EXTRA_VERSION_CODE
+import com.aurora.store.data.installer.base.InstallerBase
 import com.aurora.store.data.model.InstallerInfo
 import com.aurora.store.data.model.SessionInfo
 import com.aurora.store.data.receiver.InstallerStatusReceiver
@@ -56,7 +57,7 @@ import javax.inject.Singleton
 
 @Singleton
 class SessionInstaller @Inject constructor(
-    @ApplicationContext context: Context
+    @ApplicationContext private val context: Context
 ) : InstallerBase(context) {
 
     private val TAG = SessionInstaller::class.java.simpleName
diff --git a/app/src/main/java/com/aurora/store/data/installer/ShizukuInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/ShizukuInstaller.kt
index bc49b95ac..c17fd6f8a 100644
--- a/app/src/main/java/com/aurora/store/data/installer/ShizukuInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/ShizukuInstaller.kt
@@ -42,6 +42,7 @@ import com.aurora.store.data.installer.AppInstaller.Companion.ACTION_INSTALL_STA
 import com.aurora.store.data.installer.AppInstaller.Companion.EXTRA_DISPLAY_NAME
 import com.aurora.store.data.installer.AppInstaller.Companion.EXTRA_PACKAGE_NAME
 import com.aurora.store.data.installer.AppInstaller.Companion.EXTRA_VERSION_CODE
+import com.aurora.store.data.installer.base.InstallerBase
 import com.aurora.store.data.model.InstallerInfo
 import com.aurora.store.data.receiver.InstallerStatusReceiver
 import com.aurora.store.data.room.download.Download
@@ -56,7 +57,7 @@ import javax.inject.Singleton
 @Singleton
 @RequiresApi(Build.VERSION_CODES.O)
 class ShizukuInstaller @Inject constructor(
-    @ApplicationContext context: Context
+    @ApplicationContext private val context: Context
 ) : InstallerBase(context) {
 
     companion object {
diff --git a/app/src/main/java/com/aurora/store/data/installer/IInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/base/IInstaller.kt
similarity index 95%
rename from app/src/main/java/com/aurora/store/data/installer/IInstaller.kt
rename to app/src/main/java/com/aurora/store/data/installer/base/IInstaller.kt
index d0b9200bb..2c832110f 100644
--- a/app/src/main/java/com/aurora/store/data/installer/IInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/base/IInstaller.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.data.installer
+package com.aurora.store.data.installer.base
 
 import com.aurora.store.data.room.download.Download
 
diff --git a/app/src/main/java/com/aurora/store/data/installer/InstallerBase.kt b/app/src/main/java/com/aurora/store/data/installer/base/InstallerBase.kt
similarity index 94%
rename from app/src/main/java/com/aurora/store/data/installer/InstallerBase.kt
rename to app/src/main/java/com/aurora/store/data/installer/base/InstallerBase.kt
index 2cd8a5572..0ca3c2301 100644
--- a/app/src/main/java/com/aurora/store/data/installer/InstallerBase.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/base/InstallerBase.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.data.installer
+package com.aurora.store.data.installer.base
 
 import android.content.Context
 import android.net.Uri
@@ -26,13 +26,14 @@ import androidx.core.content.FileProvider
 import com.aurora.store.AuroraApp
 import com.aurora.store.BuildConfig
 import com.aurora.store.data.event.InstallerEvent
+import com.aurora.store.data.installer.AppInstaller
 import com.aurora.store.data.room.download.Download
 import com.aurora.store.util.PathUtil
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_AUTO_DELETE
 import java.io.File
 
-abstract class InstallerBase(protected var context: Context) : IInstaller {
+abstract class InstallerBase(private val context: Context) : IInstaller {
 
     private val TAG = InstallerBase::class.java.simpleName