Merge pull request #100 from solrudev/develop

0.9.4

README.md

@@ -32,7 +32,7 @@ Ackpine depends on Jetpack libraries, so it's necessary to declare the `google()
 
 ```kotlin
 dependencies {
-    val ackpineVersion = "0.9.3"
+    val ackpineVersion = "0.9.4"
     implementation("ru.solrudev.ackpine:ackpine-core:$ackpineVersion")
 
     // optional - Kotlin extensions and Coroutines support
@@ -49,7 +49,7 @@ dependencies {
 License
 -------
 
-    Copyright (C) 2023-2024 Ilya Fomichev
+    Copyright (C) 2023-2025 Ilya Fomichev
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

ackpine-assets/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,4 +27,8 @@ ackpine {
 	artifact {
 		name = "Ackpine Assets"
 	}
+}
+
+dependencies {
+	implementation(projects.ackpineRuntime)
 }

ackpine-assets/src/main/kotlin/ru/solrudev/ackpine/AssetFileProvider.kt

@@ -31,6 +31,7 @@ import android.os.CancellationSignal
 import android.os.ParcelFileDescriptor
 import android.provider.OpenableColumns
 import android.webkit.MimeTypeMap
+import ru.solrudev.ackpine.helpers.use
 import java.io.FileNotFoundException
 
 /**
@@ -135,12 +136,8 @@ public class AssetFileProvider : ContentProvider() {
 		val row = arrayOfNulls<Any>(columnNames.size)
 		row.setColumn(OpenableColumns.DISPLAY_NAME, uri.lastPathSegment)
 		if (OpenableColumns.SIZE in columnNames) {
-			var assetFileDescriptor: AssetFileDescriptor? = null
-			try {
-				assetFileDescriptor = openAssetFile(uri, "r", signal)
+			openAssetFile(uri, "r", signal).use { assetFileDescriptor ->
 				row.setColumn(OpenableColumns.SIZE, assetFileDescriptor?.declaredLength ?: -1L)
-			} finally {
-				assetFileDescriptor?.close()
 			}
 		}
 		cursor.addRow(row)

ackpine-core/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/Ackpine.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/DisposableSubscription.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/helpers/concurrent/BinarySemaphore.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@file:Suppress("ConstPropertyName")
+@file:Suppress("ConstPropertyName", "Unused")
 
 package ru.solrudev.ackpine.helpers.concurrent
 

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/helpers/concurrent/ExecutorHelpers.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/helpers/concurrent/ListenableFutureHelpers.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/activity/SessionCommitActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -194,7 +194,7 @@ internal abstract class SessionCommitActivity<F : Failure> protected constructor
 
 	internal companion object {
 
-		@get:JvmSynthetic
+		@JvmSynthetic
 		internal const val EXTRA_ACKPINE_SESSION_ID = "ACKPINE_SESSION_ID"
 	}
 }

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/database/AckpineDatabase.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/database/converters/Converters.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/database/dao/InstallSessionDao.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/database/dao/NotificationIdDao.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/database/dao/SessionDao.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/database/dao/UninstallSessionDao.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/database/model/SessionEntity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/installer/InstallSessionFactory.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@file:Suppress("ConstPropertyName")
+@file:Suppress("ConstPropertyName", "Unused")
 
 package ru.solrudev.ackpine.impl.installer
 
@@ -67,7 +67,7 @@ internal interface InstallSessionFactory {
 	@WorkerThread
 	fun create(
 		session: SessionEntity.InstallSession,
-		needToCompleteIfSucceeded: Boolean = false
+		completeIfSucceeded: Boolean = false
 	): ProgressSession<InstallFailure>
 
 	fun resolveNotificationData(notificationData: NotificationData, name: String): NotificationData
@@ -131,10 +131,10 @@ internal class InstallSessionFactoryImpl internal constructor(
 
 	override fun create(
 		session: SessionEntity.InstallSession,
-		needToCompleteIfSucceeded: Boolean
+		completeIfSucceeded: Boolean
 	): ProgressSession<InstallFailure> = when (session.installerType) {
-		InstallerType.INTENT_BASED -> createIntentBasedInstallSession(session, needToCompleteIfSucceeded)
-		InstallerType.SESSION_BASED -> createSessionBasedInstallSession(session, needToCompleteIfSucceeded)
+		InstallerType.INTENT_BASED -> createIntentBasedInstallSession(session, completeIfSucceeded)
+		InstallerType.SESSION_BASED -> createSessionBasedInstallSession(session, completeIfSucceeded)
 	}
 
 	override fun resolveNotificationData(notificationData: NotificationData, name: String) = notificationData.run {
@@ -158,7 +158,7 @@ internal class InstallSessionFactoryImpl internal constructor(
 
 	private fun createIntentBasedInstallSession(
 		installSession: SessionEntity.InstallSession,
-		needToCompleteIfSucceeded: Boolean
+		completeIfSucceeded: Boolean
 	): IntentBasedInstallSession {
 		val id = UUID.fromString(installSession.session.id)
 		val initialState = installSession.getState(installSessionDao)
@@ -173,7 +173,7 @@ internal class InstallSessionFactoryImpl internal constructor(
 			sessionProgressDao, executor, handler, installSession.notificationId!!,
 			BinarySemaphore()
 		)
-		if (!needToCompleteIfSucceeded || initialState.isTerminal) {
+		if (!completeIfSucceeded || initialState.isTerminal) {
 			return session
 		}
 		// Though it somewhat helps with self-update sessions, it's still faulty:
@@ -188,19 +188,16 @@ internal class InstallSessionFactoryImpl internal constructor(
 		val lastUpdateTimestamp = installSession.lastUpdateTimestamp ?: Long.MAX_VALUE
 		val isSelfUpdate = initialState is Committed && applicationContext.packageName == packageName
 		val isLastUpdateTimestampUpdated = getLastSelfUpdateTimestamp() > lastUpdateTimestamp
-		val isSuccessfulSelfUpdate = isSelfUpdate && isLastUpdateTimestampUpdated
-		if (isSuccessfulSelfUpdate) {
+		if (isSelfUpdate && isLastUpdateTimestampUpdated) {
 			session.complete(Succeeded)
-		}
-		if (isSuccessfulSelfUpdate) {
 			lastUpdateTimestampDao.setLastUpdateTimestamp(id.toString(), getLastSelfUpdateTimestamp())
 		}
 		return session
 	}
 
 	private fun createSessionBasedInstallSession(
 		installSession: SessionEntity.InstallSession,
-		needToCompleteIfSucceeded: Boolean
+		completeIfSucceeded: Boolean
 	): SessionBasedInstallSession {
 		val initialState = installSession.getState(installSessionDao)
 		val initialProgress = installSession.getProgress(sessionProgressDao)
@@ -213,17 +210,17 @@ internal class InstallSessionFactoryImpl internal constructor(
 			installSession.session.confirmation, installSession.getNotificationData(),
 			installSession.session.requireUserAction, installSession.getInstallMode(),
 			installSession.getPreapproval(), installSession.getConstraints(),
-			requestUpdateOwnership = installSession.requestUpdateOwnership ?: false,
+			requestUpdateOwnership = installSession.requestUpdateOwnership == true,
 			packageSource = installSession.packageSource ?: PackageSource.Unspecified,
 			sessionDao,
 			sessionFailureDao = installSessionDao,
 			sessionProgressDao, nativeSessionIdDao, installPreapprovalDao, installConstraintsDao,
 			executor, handler, nativeSessionId, installSession.notificationId!!,
 			commitAttemptsCount = installSession.constraints?.commitAttemptsCount ?: 0,
-			isPreapproved = installSession.preapproval?.isPreapproved ?: false,
+			isPreapproved = installSession.preapproval?.isPreapproved == true,
 			dbWriteSemaphore = BinarySemaphore()
 		)
-		if (!needToCompleteIfSucceeded || initialState.isTerminal) {
+		if (!completeIfSucceeded || initialState.isTerminal) {
 			return session
 		}
 		val progressThreshold = (applicationContext.getSessionBasedSessionCommitProgressValue() * PROGRESS_MAX).toInt()

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/installer/PackageInstallerImpl.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,7 +127,7 @@ internal class PackageInstallerImpl internal constructor(
 			.aggregate { type, _: Unit?, session, first ->
 				val installSession = installSessionFactory.create(
 					session,
-					needToCompleteIfSucceeded = type == SESSION_BASED || first && type == INTENT_BASED
+					completeIfSucceeded = type == SESSION_BASED || first && type == INTENT_BASED
 				)
 				sessions[installSession.id] = installSession
 			}

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/installer/activity/InstallActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/installer/activity/IntentBasedInstallActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ internal class IntentBasedInstallActivity : InstallActivity(TAG, startsActivity
 
 	internal companion object {
 
-		@get:JvmSynthetic
+		@JvmSynthetic
 		internal const val APK_URI_KEY = "ACKPINE_INSTALLER_APK_URI"
 	}
 }

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/installer/activity/SessionBasedInstallConfirmationActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/installer/receiver/PackageInstallerStatusReceiver.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -220,22 +220,22 @@ internal class PackageInstallerStatusReceiver : BroadcastReceiver() {
 		@JvmSynthetic
 		internal fun getAction(context: Context) = "${context.packageName}.PACKAGE_INSTALLER_STATUS"
 
-		@get:JvmSynthetic
+		@JvmSynthetic
 		internal const val EXTRA_NOTIFICATION_BUNDLE = "ru.solrudev.ackpine.extra.NOTIFICATION_BUNDLE"
 
-		@get:JvmSynthetic
+		@JvmSynthetic
 		internal const val EXTRA_NOTIFICATION_ID = "ru.solrudev.ackpine.extra.NOTIFICATION_ID"
 
-		@get:JvmSynthetic
+		@JvmSynthetic
 		internal const val EXTRA_NOTIFICATION_TITLE = "ru.solrudev.ackpine.extra.NOTIFICATION_TITLE"
 
-		@get:JvmSynthetic
+		@JvmSynthetic
 		internal const val EXTRA_NOTIFICATION_MESSAGE = "ru.solrudev.ackpine.extra.NOTIFICATION_MESSAGE"
 
-		@get:JvmSynthetic
+		@JvmSynthetic
 		internal const val EXTRA_NOTIFICATION_ICON = "ru.solrudev.ackpine.extra.NOTIFICATION_ICON"
 
-		@get:JvmSynthetic
+		@JvmSynthetic
 		internal const val EXTRA_CONFIRMATION = "ru.solrudev.ackpine.extra.CONFIRMATION"
 	}
 }

ackpine-core/src/main/kotlin/ru/solrudev/ackpine/impl/installer/session/IntentBasedInstallSession.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Ilya Fomichev
+ * Copyright (C) 2023 Ilya Fomichev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.