athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

installer: Relocate base classes to separate package

Browse Source 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2024-11-06 18:24:01 +05:30
parent 807ecec6db
commit b6416cdaf7
9 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/aurora/store/data/installer/AMInstaller.kt
View File

@@ -4,6 +4,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.util.Log import android.util.Log
import com.aurora.store.R 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.model.InstallerInfo
import com.aurora.store.data.room.download.Download import com.aurora.store.data.room.download.Download
import com.aurora.store.util.PackageUtil.isSharedLibraryInstalled import com.aurora.store.util.PackageUtil.isSharedLibraryInstalled
@@ -17,7 +18,7 @@ import javax.inject.Singleton
@Singleton @Singleton
class AMInstaller @Inject constructor( class AMInstaller @Inject constructor(
@ApplicationContext context: Context @ApplicationContext private val context: Context
) : InstallerBase(context) { ) : InstallerBase(context) {
companion object { companion object {

1
app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt
View File

@@ -36,6 +36,7 @@ import com.aurora.extensions.isPAndAbove
import com.aurora.extensions.isSAndAbove import com.aurora.extensions.isSAndAbove
import com.aurora.store.BuildConfig import com.aurora.store.BuildConfig
import com.aurora.store.R 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.Installer
import com.aurora.store.data.model.InstallerInfo import com.aurora.store.data.model.InstallerInfo
import com.aurora.store.util.NotificationUtil import com.aurora.store.util.NotificationUtil

3
app/src/main/java/com/aurora/store/data/installer/NativeInstaller.kt
View File

@@ -26,6 +26,7 @@ import android.os.Build
import android.util.Log import android.util.Log
import com.aurora.extensions.runOnUiThread import com.aurora.extensions.runOnUiThread
import com.aurora.store.R 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.model.InstallerInfo
import com.aurora.store.data.room.download.Download import com.aurora.store.data.room.download.Download
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
@@ -36,7 +37,7 @@ import javax.inject.Singleton
@Singleton @Singleton
@Deprecated("Deprecated in favour of SessionInstaller") @Deprecated("Deprecated in favour of SessionInstaller")
class NativeInstaller @Inject constructor( class NativeInstaller @Inject constructor(
@ApplicationContext context: Context @ApplicationContext private val context: Context
) : InstallerBase(context) { ) : InstallerBase(context) {
companion object { companion object {

3
app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
View File

@@ -24,6 +24,7 @@ import android.util.Log
import com.aurora.store.AuroraApp import com.aurora.store.AuroraApp
import com.aurora.store.R import com.aurora.store.R
import com.aurora.store.data.event.InstallerEvent 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.model.InstallerInfo
import com.aurora.store.data.room.download.Download import com.aurora.store.data.room.download.Download
import com.aurora.store.util.PackageUtil.isSharedLibraryInstalled import com.aurora.store.util.PackageUtil.isSharedLibraryInstalled
@@ -35,7 +36,7 @@ import javax.inject.Singleton
@Singleton @Singleton
class RootInstaller @Inject constructor( class RootInstaller @Inject constructor(
@ApplicationContext context: Context @ApplicationContext private val context: Context
) : InstallerBase(context) { ) : InstallerBase(context) {
companion object { companion object {

5
app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt
View File

@@ -30,18 +30,17 @@ import android.os.IBinder
import android.os.Looper import android.os.Looper
import android.os.RemoteException import android.os.RemoteException
import android.util.Log import android.util.Log
import androidx.core.content.FileProvider
import com.aurora.services.IPrivilegedCallback import com.aurora.services.IPrivilegedCallback
import com.aurora.services.IPrivilegedService import com.aurora.services.IPrivilegedService
import com.aurora.store.AuroraApp import com.aurora.store.AuroraApp
import com.aurora.store.BuildConfig import com.aurora.store.BuildConfig
import com.aurora.store.R import com.aurora.store.R
import com.aurora.store.data.event.InstallerEvent 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.model.InstallerInfo
import com.aurora.store.data.room.download.Download import com.aurora.store.data.room.download.Download
import com.aurora.store.util.PackageUtil import com.aurora.store.util.PackageUtil
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import java.io.File
import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.LinkedBlockingQueue
import java.util.concurrent.ThreadPoolExecutor import java.util.concurrent.ThreadPoolExecutor
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@@ -52,7 +51,7 @@ import javax.inject.Singleton
@Singleton @Singleton
@Deprecated("Deprecated in favour of RootInstaller") @Deprecated("Deprecated in favour of RootInstaller")
class ServiceInstaller @Inject constructor( class ServiceInstaller @Inject constructor(
@ApplicationContext context: Context @ApplicationContext private val context: Context
) : InstallerBase(context) { ) : InstallerBase(context) {
private lateinit var serviceConnection: ServiceConnection private lateinit var serviceConnection: ServiceConnection

3
app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt
View File

@@ -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_DISPLAY_NAME
import com.aurora.store.data.installer.AppInstaller.Companion.EXTRA_PACKAGE_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.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.InstallerInfo
import com.aurora.store.data.model.SessionInfo import com.aurora.store.data.model.SessionInfo
import com.aurora.store.data.receiver.InstallerStatusReceiver import com.aurora.store.data.receiver.InstallerStatusReceiver
@@ -56,7 +57,7 @@ import javax.inject.Singleton
@Singleton @Singleton
class SessionInstaller @Inject constructor( class SessionInstaller @Inject constructor(
@ApplicationContext context: Context @ApplicationContext private val context: Context
) : InstallerBase(context) { ) : InstallerBase(context) {
private val TAG = SessionInstaller::class.java.simpleName private val TAG = SessionInstaller::class.java.simpleName

3
app/src/main/java/com/aurora/store/data/installer/ShizukuInstaller.kt
View File

@@ -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_DISPLAY_NAME
import com.aurora.store.data.installer.AppInstaller.Companion.EXTRA_PACKAGE_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.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.InstallerInfo
import com.aurora.store.data.receiver.InstallerStatusReceiver import com.aurora.store.data.receiver.InstallerStatusReceiver
import com.aurora.store.data.room.download.Download import com.aurora.store.data.room.download.Download
@@ -56,7 +57,7 @@ import javax.inject.Singleton
@Singleton @Singleton
@RequiresApi(Build.VERSION_CODES.O) @RequiresApi(Build.VERSION_CODES.O)
class ShizukuInstaller @Inject constructor( class ShizukuInstaller @Inject constructor(
@ApplicationContext context: Context @ApplicationContext private val context: Context
) : InstallerBase(context) { ) : InstallerBase(context) {
companion object { companion object {

2
app/src/main/java/com/aurora/store/data/installer/IInstaller.kt → app/src/main/java/com/aurora/store/data/installer/base/IInstaller.kt
View File

@@ -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 import com.aurora.store.data.room.download.Download

5
app/src/main/java/com/aurora/store/data/installer/InstallerBase.kt → app/src/main/java/com/aurora/store/data/installer/base/InstallerBase.kt
View File

@@ -17,7 +17,7 @@
* *
*/ */
package com.aurora.store.data.installer package com.aurora.store.data.installer.base
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
@@ -26,13 +26,14 @@ import androidx.core.content.FileProvider
import com.aurora.store.AuroraApp import com.aurora.store.AuroraApp
import com.aurora.store.BuildConfig import com.aurora.store.BuildConfig
import com.aurora.store.data.event.InstallerEvent 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.data.room.download.Download
import com.aurora.store.util.PathUtil import com.aurora.store.util.PathUtil
import com.aurora.store.util.Preferences import com.aurora.store.util.Preferences
import com.aurora.store.util.Preferences.PREFERENCE_AUTO_DELETE import com.aurora.store.util.Preferences.PREFERENCE_AUTO_DELETE
import java.io.File 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 private val TAG = InstallerBase::class.java.simpleName