diff --git a/app/src/main/java/com/aurora/store/AuroraApp.kt b/app/src/main/java/com/aurora/store/AuroraApp.kt index 9b8239098..164ed1186 100644 --- a/app/src/main/java/com/aurora/store/AuroraApp.kt +++ b/app/src/main/java/com/aurora/store/AuroraApp.kt @@ -58,7 +58,7 @@ class AuroraApp : Application(), Configuration.Provider { private set val enqueuedInstalls: MutableSet = mutableSetOf() - val flowEvent = FlowEvent() + val events = FlowEvent() } override fun onCreate() { diff --git a/app/src/main/java/com/aurora/store/data/event/FlowEvent.kt b/app/src/main/java/com/aurora/store/data/event/FlowEvent.kt index fab3c27fe..060e5d840 100644 --- a/app/src/main/java/com/aurora/store/data/event/FlowEvent.kt +++ b/app/src/main/java/com/aurora/store/data/event/FlowEvent.kt @@ -19,7 +19,7 @@ class FlowEvent { private val _authEvent = MutableSharedFlow(extraBufferCapacity = 1) val authEvent = _authEvent.asSharedFlow() - fun emitEvent(event: Event) { + fun send(event: Event) { when (event) { is InstallerEvent -> _installerEvent.tryEmit(event) is BusEvent -> _busEvent.tryEmit(event) diff --git a/app/src/main/java/com/aurora/store/data/installer/InstallerBase.kt b/app/src/main/java/com/aurora/store/data/installer/InstallerBase.kt index fc794b70e..0376895f6 100644 --- a/app/src/main/java/com/aurora/store/data/installer/InstallerBase.kt +++ b/app/src/main/java/com/aurora/store/data/installer/InstallerBase.kt @@ -71,7 +71,7 @@ abstract class InstallerBase(protected var context: Context) : IInstaller { this.extra = extra ?: "" } - AuroraApp.flowEvent.emitEvent(event) + AuroraApp.events.send(event) } open fun getFiles( 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 0a4f033df..39689c749 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 @@ -108,7 +108,7 @@ class RootInstaller @Inject constructor( this.extra = context.getString(R.string.installer_status_failure) this.error = parseError(shellResult) } - AuroraApp.flowEvent.emitEvent(event) + AuroraApp.events.send(event) } } else { removeFromInstallQueue(packageName) 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 19ad37444..dac829c3b 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 @@ -218,7 +218,7 @@ class ServiceInstaller @Inject constructor( try { when (returnCode) { PackageInstaller.STATUS_SUCCESS -> { - AuroraApp.flowEvent.emitEvent( + AuroraApp.events.send( InstallerEvent.Uninstalled(packageName).apply { this.extra = context.getString(R.string.action_uninstall_success) } @@ -248,7 +248,7 @@ class ServiceInstaller @Inject constructor( try { when (returnCode) { PackageInstaller.STATUS_SUCCESS -> { - AuroraApp.flowEvent.emitEvent( + AuroraApp.events.send( InstallerEvent.Installed(packageName).apply { this.extra = context.getString(R.string.installer_status_success) } 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 6a4087fca..2cd60b71d 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 @@ -79,7 +79,7 @@ class SessionInstaller @Inject constructor( ?.packageName if (packageName != null && progress > 0.0) { - AuroraApp.flowEvent.emitEvent( + AuroraApp.events.send( InstallerEvent.Installing(packageName).apply { this.progress = (progress * 100).toInt() } diff --git a/app/src/main/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt b/app/src/main/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt index ae6487c64..e097b9097 100644 --- a/app/src/main/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt +++ b/app/src/main/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt @@ -132,6 +132,6 @@ class InstallerStatusReceiver : BroadcastReceiver() { } } } - AuroraApp.flowEvent.emitEvent(event) + AuroraApp.events.send(event) } } diff --git a/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt b/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt index a2bf2d3b3..0d134dbe7 100644 --- a/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt +++ b/app/src/main/java/com/aurora/store/data/receiver/PackageManagerReceiver.kt @@ -40,11 +40,11 @@ open class PackageManagerReceiver : BroadcastReceiver() { when (intent.action) { Intent.ACTION_PACKAGE_ADDED -> { - AuroraApp.flowEvent.emitEvent(InstallerEvent.Installed(packageName)) + AuroraApp.events.send(InstallerEvent.Installed(packageName)) } Intent.ACTION_PACKAGE_REMOVED -> { - AuroraApp.flowEvent.emitEvent(InstallerEvent.Uninstalled(packageName)) + AuroraApp.events.send(InstallerEvent.Uninstalled(packageName)) } } diff --git a/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt b/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt index b07acde71..4f5f68dcb 100644 --- a/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/account/GoogleFragment.kt @@ -110,7 +110,7 @@ class GoogleFragment : BaseFragment() { } viewLifecycleOwner.lifecycleScope.launch { - AuroraApp.flowEvent.authEvent.collect { onEventReceived(it) } + AuroraApp.events.authEvent.collect { onEventReceived(it) } } } diff --git a/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt index e0d2eb1b0..6074f5bf2 100644 --- a/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt @@ -75,7 +75,7 @@ class InstalledAppsFragment : BaseFragment() { } viewLifecycleOwner.lifecycleScope.launch { - AuroraApp.flowEvent.busEvent.collect { onEvent(it) } + AuroraApp.events.busEvent.collect { onEvent(it) } } } diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt index 8a7a60f31..230286b19 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt @@ -69,7 +69,6 @@ import com.aurora.store.data.model.ViewState.Loading.getDataAs import com.aurora.store.data.providers.AuthProvider import com.aurora.store.databinding.FragmentDetailsBinding import com.aurora.store.util.CommonUtil -import com.aurora.store.util.Log import com.aurora.store.util.PackageUtil import com.aurora.store.util.PathUtil import com.aurora.store.util.Preferences @@ -366,10 +365,10 @@ class AppDetailsFragment : BaseFragment() { } viewLifecycleOwner.lifecycleScope.launch { - AuroraApp.flowEvent.busEvent.collect { onEvent(it) } + AuroraApp.events.busEvent.collect { onEvent(it) } } viewLifecycleOwner.lifecycleScope.launch { - AuroraApp.flowEvent.installerEvent.collect { onEvent(it) } + AuroraApp.events.installerEvent.collect { onEvent(it) } } } diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt index 91a024176..778d856cb 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt @@ -94,7 +94,7 @@ class AppMenuSheet : BaseDialogSheet() { } dismissAllowingStateLoss() - AuroraApp.flowEvent.emitEvent( + AuroraApp.events.send( BusEvent.Blacklisted(args.app.packageName) ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt index 799f81528..b733e260f 100644 --- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt @@ -144,7 +144,7 @@ class UpdatesFragment : BaseFragment() { } viewLifecycleOwner.lifecycleScope.launch { - AuroraApp.flowEvent.busEvent.collect { onEvent(it) } + AuroraApp.events.busEvent.collect { onEvent(it) } } } diff --git a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt index ca296de02..123d8b4e3 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt @@ -201,18 +201,18 @@ class AuthViewModel @Inject constructor( if (aasToken != null) { Preferences.putString(context, Constants.ACCOUNT_EMAIL_PLAIN, email) Preferences.putString(context, Constants.ACCOUNT_AAS_PLAIN, aasToken) - AuroraApp.flowEvent.emitEvent(AuthEvent.GoogleLogin(true, email, aasToken)) + AuroraApp.events.send(AuthEvent.GoogleLogin(true, email, aasToken)) } else { Preferences.putString(context, Constants.ACCOUNT_EMAIL_PLAIN, "") Preferences.putString(context, Constants.ACCOUNT_AAS_PLAIN, "") - AuroraApp.flowEvent.emitEvent(AuthEvent.GoogleLogin(false, "", "")) + AuroraApp.events.send(AuthEvent.GoogleLogin(false, "", "")) } } else { - AuroraApp.flowEvent.emitEvent(AuthEvent.GoogleLogin(false, "", "")) + AuroraApp.events.send(AuthEvent.GoogleLogin(false, "", "")) } } catch (exception: Exception) { Log.e(TAG, "Failed to build AuthData", exception) - AuroraApp.flowEvent.emitEvent(AuthEvent.GoogleLogin(false, "", "")) + AuroraApp.events.send(AuthEvent.GoogleLogin(false, "", "")) } } } diff --git a/app/src/main/java/com/aurora/store/viewmodel/sheets/SheetsViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/sheets/SheetsViewModel.kt index bde111b3f..0005eb08b 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/sheets/SheetsViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/sheets/SheetsViewModel.kt @@ -35,7 +35,7 @@ class SheetsViewModel @Inject constructor( val purchaseHelper = PurchaseHelper(authProvider.authData) val files = purchaseHelper.purchase(app.packageName, customVersion, app.offerType) if (files.isNotEmpty()) { - AuroraApp.flowEvent.emitEvent( + AuroraApp.events.send( BusEvent.ManualDownload(app.packageName, customVersion) ) }