feat: auto update
This commit is contained in:
1 parent
f77080f6f2
commit
90ce637846
8 files changed
+303
No files matched your search
@@ -0,0 +1,77 @@
|
||||
package de.schanbro.weekfocus.update
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.provider.Settings
|
||||
import androidx.core.content.FileProvider
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.ensureActive
|
||||
import kotlinx.coroutines.withContext
|
||||
import java.io.File
|
||||
import java.io.IOException
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URL
|
||||
|
||||
object ApkInstaller {
|
||||
|
||||
fun canInstall(context: Context): Boolean =
|
||||
context.packageManager.canRequestPackageInstalls()
|
||||
|
||||
fun openInstallPermissionSettings(context: Context) {
|
||||
val intent = Intent(
|
||||
Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
|
||||
Uri.parse("package:${context.packageName}")
|
||||
).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||
context.startActivity(intent)
|
||||
}
|
||||
|
||||
suspend fun download(
|
||||
context: Context,
|
||||
url: String,
|
||||
onProgress: (Float) -> Unit
|
||||
): File = withContext(Dispatchers.IO) {
|
||||
val dir = File(context.cacheDir, "updates").apply {
|
||||
mkdirs()
|
||||
listFiles()?.forEach { it.delete() } // alte Downloads aufräumen
|
||||
}
|
||||
val file = File(dir, "update.apk")
|
||||
|
||||
val conn = URL(url).openConnection() as HttpURLConnection
|
||||
conn.connectTimeout = 15_000
|
||||
conn.readTimeout = 15_000
|
||||
try {
|
||||
if (conn.responseCode != HttpURLConnection.HTTP_OK) {
|
||||
throw IOException("HTTP ${conn.responseCode}")
|
||||
}
|
||||
val total = conn.contentLengthLong
|
||||
conn.inputStream.use { input ->
|
||||
file.outputStream().use { output ->
|
||||
val buffer = ByteArray(16 * 1024)
|
||||
var done = 0L
|
||||
var read: Int
|
||||
while (input.read(buffer).also { read = it } != -1) {
|
||||
ensureActive() // macht den Abbruch möglich
|
||||
output.write(buffer, 0, read)
|
||||
done += read
|
||||
if (total > 0) onProgress(done.toFloat() / total)
|
||||
}
|
||||
}
|
||||
}
|
||||
file
|
||||
} finally {
|
||||
conn.disconnect()
|
||||
}
|
||||
}
|
||||
|
||||
fun install(context: Context, apk: File) {
|
||||
val uri = FileProvider.getUriForFile(
|
||||
context, "${context.packageName}.fileprovider", apk
|
||||
)
|
||||
val intent = Intent(Intent.ACTION_VIEW).apply {
|
||||
setDataAndType(uri, "application/vnd.android.package-archive")
|
||||
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||
}
|
||||
context.startActivity(intent)
|
||||
}
|
||||
}
|
||||
@@ -22,6 +22,7 @@ import androidx.compose.ui.res.stringResource
|
||||
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
||||
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
||||
import de.schanbro.weekfocus.screens.WordListScreen
|
||||
import de.schanbro.weekfocus.update.UpdateHandler
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@@ -31,6 +32,7 @@ class MainActivity : ComponentActivity() {
|
||||
setContent {
|
||||
WeekFocusTheme {
|
||||
MainScreen()
|
||||
UpdateHandler()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package de.schanbro.weekfocus.update
|
||||
|
||||
import android.content.Context
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import org.json.JSONObject
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URL
|
||||
|
||||
data class ReleaseInfo(
|
||||
val version: String,
|
||||
val notes: String,
|
||||
val apkUrl: String
|
||||
)
|
||||
|
||||
object UpdateChecker {
|
||||
|
||||
private const val LATEST_RELEASE_URL =
|
||||
"https://git.schamagusa.de/api/v1/repos/robin/WeekFocus/releases/latest"
|
||||
|
||||
/** Liefert das neueste stabile Release oder null (bei Fehler / ohne APK). */
|
||||
suspend fun fetchLatestRelease(): ReleaseInfo? = withContext(Dispatchers.IO) {
|
||||
try {
|
||||
val conn = URL(LATEST_RELEASE_URL).openConnection() as HttpURLConnection
|
||||
conn.connectTimeout = 10_000
|
||||
conn.readTimeout = 10_000
|
||||
conn.setRequestProperty("Accept", "application/json")
|
||||
try {
|
||||
if (conn.responseCode != HttpURLConnection.HTTP_OK) return@withContext null
|
||||
|
||||
val json = JSONObject(conn.inputStream.bufferedReader().use { it.readText() })
|
||||
val assets = json.getJSONArray("assets")
|
||||
val apk = (0 until assets.length())
|
||||
.map { assets.getJSONObject(it) }
|
||||
.firstOrNull { it.getString("name").endsWith(".apk", ignoreCase = true) }
|
||||
?: return@withContext null
|
||||
|
||||
ReleaseInfo(
|
||||
version = json.getString("tag_name"),
|
||||
notes = json.optString("body", ""),
|
||||
apkUrl = apk.getString("browser_download_url")
|
||||
)
|
||||
} finally {
|
||||
conn.disconnect()
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
null // Netzwerk- oder Parse-Fehler: still ignorieren
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
fun currentVersion(context: Context): String =
|
||||
context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "0"
|
||||
|
||||
/** Numerischer Vergleich pro Segment, damit 1.2.11 > 1.2.9 gilt. */
|
||||
fun isNewer(remote: String, local: String): Boolean {
|
||||
val r = parse(remote)
|
||||
val l = parse(local)
|
||||
for (i in 0 until maxOf(r.size, l.size)) {
|
||||
val a = r.getOrElse(i) { 0 }
|
||||
val b = l.getOrElse(i) { 0 }
|
||||
if (a != b) return a > b
|
||||
}
|
||||
// Gleiche Nummer: stabiles Release ist neuer als eine installierte Beta
|
||||
return local.contains("-") && !remote.contains("-")
|
||||
}
|
||||
|
||||
private fun parse(version: String): List<Int> =
|
||||
version.trim().removePrefix("v").substringBefore("-")
|
||||
.split(".").map { it.toIntOrNull() ?: 0 }
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
package de.schanbro.weekfocus.update
|
||||
|
||||
import android.content.Context
|
||||
import android.widget.Toast
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import de.schanbro.weekfocus.R
|
||||
import kotlinx.coroutines.CancellationException
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
private const val CHECK_INTERVAL_MS = 24L * 60 * 60 * 1000
|
||||
|
||||
@Composable
|
||||
fun UpdateHandler() {
|
||||
val context = LocalContext.current
|
||||
val scope = rememberCoroutineScope()
|
||||
val prefs = remember {
|
||||
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
|
||||
}
|
||||
|
||||
var release by remember { mutableStateOf<ReleaseInfo?>(null) }
|
||||
var progress by remember { mutableStateOf<Float?>(null) } // null = kein Download
|
||||
var downloadJob by remember { mutableStateOf<Job?>(null) }
|
||||
|
||||
// Einmal pro Start, höchstens alle 24 Stunden
|
||||
LaunchedEffect(Unit) {
|
||||
val now = System.currentTimeMillis()
|
||||
if (now - prefs.getLong("last_update_check", 0L) < CHECK_INTERVAL_MS) return@LaunchedEffect
|
||||
|
||||
val latest = UpdateChecker.fetchLatestRelease() ?: return@LaunchedEffect
|
||||
prefs.edit().putLong("last_update_check", now).apply()
|
||||
|
||||
if (UpdateChecker.isNewer(latest.version, UpdateChecker.currentVersion(context))) {
|
||||
release = latest
|
||||
}
|
||||
}
|
||||
|
||||
release?.let { info ->
|
||||
val downloading = progress != null
|
||||
|
||||
AlertDialog(
|
||||
onDismissRequest = { if (!downloading) release = null },
|
||||
title = { Text(stringResource(R.string.update_title)) },
|
||||
text = {
|
||||
Column(Modifier.verticalScroll(rememberScrollState())) {
|
||||
Text(stringResource(R.string.update_message, info.version.removePrefix("v")))
|
||||
if (info.notes.isNotBlank()) {
|
||||
Spacer(Modifier.height(12.dp))
|
||||
Text(
|
||||
text = info.notes,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
}
|
||||
progress?.let { p ->
|
||||
Spacer(Modifier.height(16.dp))
|
||||
LinearProgressIndicator(
|
||||
progress = { p },
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
TextButton(
|
||||
enabled = !downloading,
|
||||
onClick = {
|
||||
if (!ApkInstaller.canInstall(context)) {
|
||||
Toast.makeText(
|
||||
context, R.string.update_permission_hint, Toast.LENGTH_LONG
|
||||
).show()
|
||||
ApkInstaller.openInstallPermissionSettings(context)
|
||||
} else {
|
||||
downloadJob = scope.launch {
|
||||
progress = 0f
|
||||
try {
|
||||
val apk = ApkInstaller.download(context, info.apkUrl) {
|
||||
progress = it
|
||||
}
|
||||
progress = null
|
||||
release = null
|
||||
ApkInstaller.install(context, apk)
|
||||
} catch (e: CancellationException) {
|
||||
throw e
|
||||
} catch (e: Exception) {
|
||||
progress = null
|
||||
Toast.makeText(
|
||||
context, R.string.update_failed, Toast.LENGTH_LONG
|
||||
).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
) { Text(stringResource(R.string.update_action)) }
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(
|
||||
onClick = {
|
||||
downloadJob?.cancel()
|
||||
progress = null
|
||||
release = null
|
||||
}
|
||||
) {
|
||||
Text(
|
||||
stringResource(
|
||||
if (downloading) R.string.action_cancel else R.string.update_later
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user