From 8d38c319a237902bff27e8bc0e7d9d9b361dab7d Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Fri, 30 Oct 2026 12:50:15 +0100 Subject: [PATCH] feat: ask for network permission before checking for updates --- app/build.gradle.kts | 1 + .../de/schanbro/weekfocus/MainActivity.kt | 5 +- .../weekfocus/NetworkPermissionGate.kt | 82 +++++++++++++++++++ app/src/main/res/values-en/strings.xml | 5 ++ app/src/main/res/values/strings.xml | 6 ++ 5 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/de/schanbro/weekfocus/NetworkPermissionGate.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f2187ce..99af88b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -94,4 +94,5 @@ dependencies { debugImplementation(libs.androidx.compose.ui.tooling) implementation(libs.androidx.material.icons.extended) implementation("androidx.core:core-splashscreen:1.0.1") + implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.7") } \ No newline at end of file diff --git a/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt b/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt index 31dcdef..24a36c7 100644 --- a/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt +++ b/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt @@ -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.NetworkPermissionGate import de.schanbro.weekfocus.update.UpdateHandler class MainActivity : ComponentActivity() { @@ -32,7 +33,9 @@ class MainActivity : ComponentActivity() { setContent { WeekFocusTheme { MainScreen() - UpdateHandler() + NetworkPermissionGate { + UpdateHandler() + } } } } diff --git a/app/src/main/java/de/schanbro/weekfocus/NetworkPermissionGate.kt b/app/src/main/java/de/schanbro/weekfocus/NetworkPermissionGate.kt new file mode 100644 index 0000000..dcd1478 --- /dev/null +++ b/app/src/main/java/de/schanbro/weekfocus/NetworkPermissionGate.kt @@ -0,0 +1,82 @@ +package de.schanbro.weekfocus.update + +import android.Manifest +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.provider.Settings +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.* +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.core.content.ContextCompat +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.compose.LifecycleEventEffect +import de.schanbro.weekfocus.R + +private const val KEY_HINT_DISMISSED = "network_hint_dismissed" + +/** Zeigt [content] nur, wenn die App Netzwerkzugriff hat. Fragt sonst einmal danach. */ +@Composable +fun NetworkPermissionGate(content: @Composable () -> Unit) { + val context = LocalContext.current + val prefs = remember { + context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE) + } + + fun isGranted() = ContextCompat.checkSelfPermission( + context, Manifest.permission.INTERNET + ) == PackageManager.PERMISSION_GRANTED + + var granted by remember { mutableStateOf(isGranted()) } + var showDialog by remember { + mutableStateOf(!isGranted() && !prefs.getBoolean(KEY_HINT_DISMISSED, false)) + } + + val launcher = rememberLauncherForActivityResult( + ActivityResultContracts.RequestPermission() + ) { result -> + granted = result || isGranted() + if (!granted) openAppSettings(context) // kein System-Dialog möglich → Einstellungen + } + + // Nach Rückkehr aus den Einstellungen neu prüfen + LifecycleEventEffect(Lifecycle.Event.ON_RESUME) { + granted = isGranted() + } + + if (granted) { + content() + } else if (showDialog) { + AlertDialog( + onDismissRequest = {}, + title = { Text(stringResource(R.string.permission_network_title)) }, + text = { Text(stringResource(R.string.permission_network_message)) }, + confirmButton = { + TextButton(onClick = { + showDialog = false + launcher.launch(Manifest.permission.INTERNET) + }) { Text(stringResource(R.string.permission_allow)) } + }, + dismissButton = { + TextButton(onClick = { + prefs.edit().putBoolean(KEY_HINT_DISMISSED, true).apply() + showDialog = false + }) { Text(stringResource(R.string.permission_not_now)) } + } + ) + } +} + +private fun openAppSettings(context: Context) { + val intent = Intent( + Settings.ACTION_APPLICATION_DETAILS_SETTINGS, + Uri.fromParts("package", context.packageName, null) + ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(intent) +} \ No newline at end of file diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index f8fed8c..997d3ec 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -23,4 +23,9 @@ Later Update failed. Please try again later. Please allow installs from this source, then tap “Update” again. + + Network access needed + WeekFocus needs network access to check for updates. Without it the app keeps working, but won’t look for new versions. + Allow + Not now \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3071b9d..3a429f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,4 +27,10 @@ Später Update fehlgeschlagen. Bitte später erneut versuchen. Bitte die Installation aus dieser Quelle erlauben und danach erneut auf „Aktualisieren“ tippen. + + + Netzwerkzugriff benötigt + WeekFocus braucht Netzwerkzugriff, um nach Updates zu suchen. Ohne Zugriff funktioniert die App weiterhin, sucht aber nicht nach neuen Versionen. + Erlauben + Nicht jetzt \ No newline at end of file