Merge branch '0000-a15-remove-split-install-dead-code' into 'main' (a4ccb92d) · Commits · e / os / App Lounge

app/build.gradle

+0 −4

Original line number	Diff line number	Diff line
		@@ -178,10 +178,6 @@ dependencies {
		implementation(project(":auth-data-lib"))
		implementation(project(":parental-control-data"))

		// Library dependencies
		// TODO: Add splitinstall-lib to a repo https://gitlab.e.foundation/e/os/backlog/-/issues/628
		api(files("libs/splitinstall-lib.jar"))

		// eFoundation libraries
		implementation(libs.telemetry)
		implementation(libs.gplayapi)

app/detekt-baseline.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,6 @@
		<ID>ReturnCount:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$private suspend fun getAuthDataWithGoogleAccount(): ResultSupreme<AuthData?></ID>
		<ID>ReturnCount:PrivacyInfoViewModel.kt$PrivacyInfoViewModel$fun shouldRequestExodusReport(application: Application?): Boolean</ID>
		<ID>ReturnCount:SearchApiImpl.kt$SearchApiImpl$private suspend fun replaceWithFDroid(gPlayApps: List<Application>): List<Application></ID>
		<ID>ReturnCount:SplitInstallBinder.kt$SplitInstallBinder$private fun showErrorNotification(context: Context, packageName: String)</ID>
		<ID>ReturnCount:StorageNotificationManager.kt$StorageNotificationManager$private fun getSpaceMissing(appInstall: AppInstall, downloadId: Long? = null): Long</ID>
		<ID>ReturnCount:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$private suspend fun getApplication( packageName: String, releaseType: OsReleaseType, sdkLevel: Int, device: String, ): Application?</ID>
		<ID>ReturnCount:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$private suspend fun getReleaseDetailsUrl( systemAppProject: SystemAppProject, releaseType: OsReleaseType, ): String?</ID>

app/src/main/AndroidManifest.xml

+0 −16

Original line number	Diff line number	Diff line
		@@ -198,27 +198,11 @@
		android:exported="true"
		android:readPermission="${applicationId}.permission.PROVIDER_READ" />

		<!-- TODO: ExportedService, suppressing because changes are needed in other apps -->
		<service
		android:name=".install.splitinstall.SplitInstallService"
		tools:ignore="ExportedService"
		android:exported="true"
		android:foregroundServiceType="dataSync">
		</service>

		<service
		android:name="androidx.work.impl.foreground.SystemForegroundService"
		android:foregroundServiceType="dataSync"
		tools:node="merge" />

		<receiver
		android:name=".install.splitinstall.SplitInstallBinder$IgnoreReceiver"
		android:exported="false" />

		<receiver
		android:name=".install.splitinstall.SplitInstallBinder$SignInReceiver"
		android:exported="false" />

		<provider
		android:name=".microg.AuthDataProvider"
		android:authorities="${applicationId}.authdata.provider"

app/src/main/java/foundation/e/apps/data/DownloadManager.kt

+0 −26

Original line number	Diff line number	Diff line
		@@ -51,8 +51,6 @@ class DownloadManager @Inject constructor(
		private val downloadsMaps = HashMap<Long, Boolean>()

		companion object {
		private val SDCARD_PATH = Environment.getExternalStorageDirectory().absolutePath
		val EXTERNAL_STORAGE_TEMP_CACHE_DIR = "$SDCARD_PATH/Download/AppLounge/SplitInstallApks"
		private const val UNKNOWN_ERROR_OR_REASON = -1
		}

		@@ -72,30 +70,6 @@ class DownloadManager @Inject constructor(
		return downloadFile(url, downloadFile, downloadCompleted)
		}

		fun downloadFileInExternalStorage(
		url: String,
		subDirectoryPath: String,
		fileName: String,
		downloadCompleted: ((Boolean, String) -> Unit)?
		): Long {

		val directoryFile = File("$EXTERNAL_STORAGE_TEMP_CACHE_DIR/$subDirectoryPath")
		if (!directoryFile.exists()) {
		directoryFile.mkdirs()
		}

		val downloadFile = File("$directoryFile/$fileName")
		if (downloadFile.exists()) {
		try {
		downloadFile.delete()
		} catch (exception: Exception) {
		Timber.e("Could not delete already existing split apk: $downloadFile", exception)
		}
		}

		return downloadFile(url, downloadFile, downloadCompleted)
		}

		private fun downloadFile(
		url: String,
		downloadFile: File,

app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt

deleted100644 → 0

+0 −282

Original line number	Diff line number	Diff line
		/*
		* Apps Quickly and easily install Android apps onto your device!
		* Copyright (C) 2021-2022 E FOUNDATION
		*
		* This program is free software: you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation, either version 3 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program. If not, see <https://www.gnu.org/licenses/>.
		*/

		package foundation.e.apps.install.splitinstall

		import android.Manifest
		import android.app.NotificationChannel
		import android.app.NotificationManager
		import android.app.PendingIntent
		import android.content.BroadcastReceiver
		import android.content.Context
		import android.content.Intent
		import android.content.pm.PackageManager
		import android.os.Build
		import androidx.core.app.ActivityCompat
		import androidx.core.app.NotificationCompat
		import androidx.core.app.NotificationManagerCompat
		import androidx.core.content.pm.PackageInfoCompat
		import foundation.e.apps.ISplitInstallService
		import foundation.e.apps.ui.MainActivity
		import foundation.e.apps.R
		import foundation.e.apps.data.DownloadManager
		import foundation.e.apps.data.application.ApplicationRepository
		import foundation.e.apps.data.login.AuthenticatorRepository
		import foundation.e.apps.data.login.exceptions.GPlayLoginException
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.withContext
		import timber.log.Timber
		import java.util.Collections
		import java.util.TreeSet

		class SplitInstallBinder(
		val context: Context,
		private val coroutineScope: CoroutineScope,
		val applicationRepository: ApplicationRepository,
		val downloadManager: DownloadManager,
		val authenticatorRepository: AuthenticatorRepository,
		private var splitInstallSystemService: foundation.e.splitinstall.ISplitInstallService?
		) : ISplitInstallService.Stub() {

		private val modulesToInstall = HashMap<String, String>()

		companion object {
		const val TAG = "SplitInstallerBinder"
		const val AUTH_DATA_ERROR_MESSAGE = "Could not get auth data"
		const val NOTIFICATION_CHANNEL = "Dynamic module install"
		const val NOTIFICATION_ID_KEY = "notification_id_key"
		const val PACKAGE_NAME_KEY = "package_name_key"
		const val PREFERENCES_FILE_NAME = "packages_to_ignore"
		const val PACKAGES_LIST_KEY = "packages_list_key"
		}

		override fun installSplitModule(packageName: String, moduleName: String) {
		coroutineScope.launch {
		try {
		authenticatorRepository.getValidatedAuthData()
		authenticatorRepository.getGPlayAuthOrThrow()
		downloadModule(packageName, moduleName)
		} catch (exception: GPlayLoginException) {
		Timber.w("$AUTH_DATA_ERROR_MESSAGE $exception")
		handleError(packageName)
		}
		}
		}

		private fun handleError(packageName: String) {
		createNotificationChannel(context)
		showErrorNotification(context, packageName)
		}

		private fun createNotificationChannel(context: Context) {
		val descriptionText = context.getString(R.string.notification_channel_desc)
		val notificationChannel = NotificationChannel(
		NOTIFICATION_CHANNEL,
		NOTIFICATION_CHANNEL,
		NotificationManager.IMPORTANCE_LOW
		).apply {
		description = descriptionText
		}

		val notificationManager =
		context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

		notificationManager.createNotificationChannel(notificationChannel)
		}

		private fun showErrorNotification(context: Context, packageName: String) {
		if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS)
		!= PackageManager.PERMISSION_GRANTED
		) {
		return
		}

		val preferences = context.getSharedPreferences(PREFERENCES_FILE_NAME, Context.MODE_PRIVATE)
		val ignoreList = preferences.getStringSet(PACKAGES_LIST_KEY, Collections.emptySet())
		if (ignoreList != null && packageName in ignoreList) return

		val appInfo = context.packageManager.getPackageInfo(packageName, 0).applicationInfo
		?: return
		val appLabel = context.packageManager.getApplicationLabel(appInfo)
		val callerUid = appInfo.uid
		val contentText = context.getString(
		R.string.split_install_warning_text,
		appLabel
		)

		val notificationBuilder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL)
		.setSmallIcon(R.drawable.app_lounge_notification_icon)
		.setContentTitle(context.getString(R.string.split_install_warning_title, appLabel))
		.setContentText(contentText)
		.setStyle(NotificationCompat.BigTextStyle().bigText(contentText))
		.addAction(
		NotificationCompat.Action.Builder(
		null,
		context.getString(R.string.sign_in),
		buildSignInPendingIntent(callerUid)
		).build()
		)
		.addAction(
		NotificationCompat.Action.Builder(
		null,
		context.getString(R.string.ignore),
		buildIgnorePendingIntent(callerUid, packageName)
		).build()
		)

		with(NotificationManagerCompat.from(context)) {
		notify(callerUid, notificationBuilder.build())
		}
		}

		private fun buildIgnorePendingIntent(callerUid: Int, packageName: String): PendingIntent {

		val ignoreIntent = Intent(context, IgnoreReceiver::class.java).apply {
		putExtra(NOTIFICATION_ID_KEY, callerUid)
		putExtra(PACKAGE_NAME_KEY, packageName)
		}

		return PendingIntent.getBroadcast(
		context,
		callerUid,
		ignoreIntent,
		PendingIntent.FLAG_MUTABLE
		)
		}

		private fun buildSignInPendingIntent(callerUid: Int): PendingIntent {
		val signInIntent = Intent(context, SignInReceiver::class.java).apply {
		putExtra(NOTIFICATION_ID_KEY, callerUid)
		}

		return PendingIntent.getBroadcast(
		context,
		callerUid,
		signInIntent,
		PendingIntent.FLAG_MUTABLE
		)
		}

		fun setService(service: foundation.e.splitinstall.ISplitInstallService) {
		splitInstallSystemService = service
		installPendingModules()
		}

		private suspend fun downloadModule(packageName: String, moduleName: String) {
		withContext(Dispatchers.IO) {
		val versionCode = getPackageVersionCode(packageName)
		val url = fetchModuleUrl(packageName, moduleName, versionCode)

		if (url == null) {
		Timber.w("Could not find split module named $moduleName for $packageName package")
		return@withContext
		}

		downloadManager.downloadFileInExternalStorage(
		url, packageName, "$packageName.split.$moduleName.apk"
		) { success, path ->
		if (success) {
		Timber.i("Split module has been downloaded: $path")
		if (splitInstallSystemService == null) {
		Timber.i("Not connected to system service now. Adding $path to the list.")
		modulesToInstall[path] = packageName
		}
		splitInstallSystemService?.installSplitModule(packageName, path)
		}
		}
		}
		}

		private fun getPackageVersionCode(packageName: String): Int {
		val packageInfo = context.packageManager.getPackageInfo(packageName, 0)
		val longVersionCode = PackageInfoCompat.getLongVersionCode(packageInfo)
		return longVersionCode.toInt()
		}

		private suspend fun fetchModuleUrl(
		packageName: String,
		moduleName: String,
		versionCode: Int
		): String? {
		var url = applicationRepository.getOnDemandModule(packageName, moduleName, versionCode, 1)

		if (url == null) {
		url = applicationRepository.getOnDemandModule(
		packageName,
		"config.$moduleName",
		versionCode,
		1
		)
		}

		return url
		}

		private fun installPendingModules() {
		for (module in modulesToInstall.keys) {
		val packageName = modulesToInstall[module]
		splitInstallSystemService?.installSplitModule(packageName, module)
		}
		}

		class IgnoreReceiver: BroadcastReceiver() {

		override fun onReceive(context: Context?, intent: Intent?) {
		if (context == null \|\| intent == null) {
		return
		}

		NotificationManagerCompat.from(context).cancel(
		intent.getIntExtra(NOTIFICATION_ID_KEY, -1)
		)

		val packageName = intent.getStringExtra(PACKAGE_NAME_KEY) ?: return
		val preferences = context.getSharedPreferences(
		PREFERENCES_FILE_NAME,
		Context.MODE_PRIVATE
		)

		val ignoreList = preferences.getStringSet(PACKAGES_LIST_KEY, Collections.emptySet())
		?: Collections.emptySet()

		val newList = TreeSet(ignoreList)
		newList.add(packageName)
		preferences.edit().putStringSet(PACKAGES_LIST_KEY, newList).apply()
		}
		}

		class SignInReceiver: BroadcastReceiver() {
		override fun onReceive(context: Context?, intent: Intent?) {
		if (context == null \|\| intent == null) {
		return
		}

		NotificationManagerCompat.from(context).cancel(
		intent.getIntExtra(NOTIFICATION_ID_KEY, -1)
		)

		val launchAppLoungeIntent = Intent(context, MainActivity::class.java).apply {
		flags = Intent.FLAG_ACTIVITY_NEW_TASK
		}

		context.startActivity(launchAppLoungeIntent)
		}
		}
		}