Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc50854 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '549os-some-renaming' into 'master'

Rename SplitInstallerService to SplitInstallService

See merge request !4
parents e2beb39d 38d9f326
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@

package foundation.e.apps;

interface ISplitInstallerService {
interface ISplitInstallService {
    void installSplitModule(String packageName, String moduleName);
}
 No newline at end of file
+9 −7
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.content.Intent
import android.content.ServiceConnection
import android.os.IBinder
import com.android.vending.splitinstall.SplitInstaller
import foundation.e.apps.ISplitInstallerService
import foundation.e.apps.ISplitInstallService

class AppLoungeSplitInstaller(
    private val context: Context
@@ -31,15 +31,15 @@ class AppLoungeSplitInstaller(

    companion object {
        private val ON_DEMAND_DELIVERY_SERVICE_COMPONENT =
            ComponentName("foundation.e.apps", "foundation.e.apps.splitinstall.SplitInstallerService")
            ComponentName("foundation.e.apps", "foundation.e.apps.splitinstall.SplitInstallService")
    }

    private var service: ISplitInstallerService? = null
    private var service: ISplitInstallService? = null
    private val moduleList = ArrayList<InstallModule>()

    private val serviceConnection = object : ServiceConnection {
        override fun onServiceConnected(componentName: ComponentName, binder: IBinder) {
            service = ISplitInstallerService.Stub.asInterface(binder)
            service = ISplitInstallService.Stub.asInterface(binder)
            installWaitingModules()
        }

@@ -61,9 +61,11 @@ class AppLoungeSplitInstaller(
    }

    override fun install(packageName: String, moduleName: String) {
        service.let {
        if (service == null) {
            moduleList.add(InstallModule(packageName, moduleName))
        }

        service?.installSplitModule(packageName, moduleName)
        } ?: moduleList.add(InstallModule(packageName, moduleName))
    }

    private fun installWaitingModules() {