Merge branch '2861-u-misc-patches' into 'main' (41e82a8c) · Commits · e / os / App Lounge

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:master
		image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:java21

		variables:
		SENTRY_DSN: $SENTRY_DSN

+3 −3

Original line number	Diff line number	Diff line
		@@ -206,11 +206,11 @@ android {
		aidl = true
		}
		compileOptions {
		sourceCompatibility = JavaVersion.VERSION_17
		targetCompatibility = JavaVersion.VERSION_17
		sourceCompatibility = JavaVersion.VERSION_21
		targetCompatibility = JavaVersion.VERSION_21
		}
		kotlinOptions {
		jvmTarget = '17'
		jvmTarget = '21'
		}
		lint {
		lintConfig = file('lint.xml')

+0 −5

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

		<service
		android:name=".install.pkg.PackageInstallerService"
		android:foregroundServiceType="dataSync">
		</service>

		<!-- TODO: ExportedService, suppressing because changes are needed in other apps -->
		<service
		android:name=".install.splitinstall.SplitInstallService"

+7 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		package foundation.e.apps.data.playstore

		import android.content.Context
		import android.os.Build
		import com.aurora.gplayapi.SearchSuggestEntry
		import com.aurora.gplayapi.data.models.App as GplayApp
		import com.aurora.gplayapi.data.models.Category
		@@ -45,6 +46,7 @@ import foundation.e.apps.data.application.utils.toApplication
		import foundation.e.apps.data.enums.Source
		import foundation.e.apps.data.login.AuthenticatorRepository
		import foundation.e.apps.data.playstore.utils.GPlayHttpClient
		import foundation.e.apps.utils.SystemInfoProvider
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.withContext
		import timber.log.Timber
		@@ -148,13 +150,17 @@ class PlayStoreRepository @Inject constructor(
		appDetails = appDetailsHelper.getAppByPackageName(packageName)
		}

		if (appDetails?.versionCode == 0) {
		if (!isEmulator() && appDetails?.versionCode == 0) {
		throw IllegalStateException("App version code cannot be 0")
		}

		return appDetails?.toApplication(context) ?: Application()
		}

		private fun isEmulator(): Boolean {
		return SystemInfoProvider.getSystemProperty("ro.boot.qemu").equals("1")
		}

		private fun getCategoryType(type: CategoryType): Category.Type {
		return if (type == CategoryType.APPLICATION) Category.Type.APPLICATION
		else Category.Type.GAME

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import com.aurora.gplayapi.GooglePlayApi
		import com.aurora.gplayapi.data.models.AuthData
		import com.aurora.gplayapi.data.models.PlayResponse
		import com.aurora.gplayapi.data.providers.HeaderProvider
		import com.aurora.gplayapi.helpers.AuthValidator
		import com.aurora.gplayapi.helpers.NativeHelper
		import com.aurora.gplayapi.network.IHttpClient