resolved conflict (54720050) · Commits · e / os / App Lounge

app/build.gradle

+3 −3

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ plugins {

		def versionMajor = 2
		def versionMinor = 8
		def versionPatch = 1
		def versionPatch = 4

		def getGitHash = { ->
		def stdOut = new ByteArrayOutputStream()
		@@ -100,8 +100,8 @@ android {

		buildTypes {
		debug {
		versionNameSuffix ".debug"
		applicationIdSuffix ".debug"
		// versionNameSuffix ".debug"
		// applicationIdSuffix ".debug"
		signingConfig signingConfigs.debugConfig
		proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ class MainActivity : AppCompatActivity() {

		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)

		Timber.i("===> mainactivity onCreate... 7")
		binding = ActivityMainBinding.inflate(layoutInflater)

		setupBackPressHandlingForTiramisuAndAbove()

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ class DownloadInfoApiImpl @Inject constructor(
		) {
		val downloadInfo =
		(appSources.cleanApkAppsRepo as CleanApkDownloadInfoFetcher)
		.getDownloadInfo(appInstall.id).body()
		.getDownloadInfo(appInstall.id, architecture = appInstall.architecture).body()
		downloadInfo?.download_data?.download_link?.let { list.add(it) }
		appInstall.signature = downloadInfo?.download_data?.signature ?: ""
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,5 +22,5 @@ import foundation.e.apps.data.cleanapk.data.download.Download
		import retrofit2.Response

		interface CleanApkDownloadInfoFetcher {
		suspend fun getDownloadInfo(idOrPackageName: String, versionCode: Any? = null): Response<Download>
		suspend fun getDownloadInfo(idOrPackageName: String, versionCode: Any? = null, architecture: String? = null): Response<Download>
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -79,8 +79,8 @@ class CleanApkAppsRepositoryImpl(
		return cleanApkAppDetailsRetrofit.getAppOrPWADetailsByID(packageNameOrId, null, null)
		}

		override suspend fun getDownloadInfo(idOrPackageName: String, versionCode: Any?): Response<Download> {
		override suspend fun getDownloadInfo(idOrPackageName: String, versionCode: Any?, architecture: String?): Response<Download> {
		val version = versionCode?.let { it as String }
		return cleanApkRetrofit.getDownloadInfo(idOrPackageName, version, null)
		return cleanApkRetrofit.getDownloadInfo(idOrPackageName, version, "armeabi-v7a")
		}
		}