From 15ae018589cf7d99fe26051e9fb52999356f41e6 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 28 Oct 2024 01:00:00 +0100
Subject: [PATCH 01/23] Add insets to the add app dialog

---
 .../apps/add/AddCategoryAppsFragment.kt       | 33 ++++++++++++++++--
 .../AddAppActivitiesDialogFragment.kt         | 34 +++++++++++++++++--
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt b/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt
index ed748f7..2980329 100644
--- a/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,14 +16,21 @@
 package io.timelimit.android.ui.manage.category.apps.add
 
 import android.app.Dialog
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
@@ -220,9 +227,29 @@ class AddCategoryAppsFragment : DialogFragment() {
             }
         }
 
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+
+            v.updateLayoutParams<MarginLayoutParams> {
+                topMargin = insets.top
+                bottomMargin = insets.bottom
+                leftMargin = insets.left
+                rightMargin = insets.right
+            }
+
+            WindowInsetsCompat.CONSUMED
+        }
+
         return AlertDialog.Builder(requireContext(), R.style.AppTheme)
-                .setView(binding.root)
-                .create()
+            .setView(binding.root)
+            .create()
+            .also { dialog ->
+                if (VERSION.SDK_INT >= VERSION_CODES.VANILLA_ICE_CREAM) dialog.setOnShowListener {
+                    WindowInsetsControllerCompat(dialog.window!!, binding.root).run {
+                        isAppearanceLightStatusBars = true
+                    }
+                }
+            }
     }
 
     fun show(manager: FragmentManager) {
diff --git a/app/src/main/java/io/timelimit/android/ui/manage/category/apps/addactivity/AddAppActivitiesDialogFragment.kt b/app/src/main/java/io/timelimit/android/ui/manage/category/apps/addactivity/AddAppActivitiesDialogFragment.kt
index ee84029..4dceae8 100644
--- a/app/src/main/java/io/timelimit/android/ui/manage/category/apps/addactivity/AddAppActivitiesDialogFragment.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manage/category/apps/addactivity/AddAppActivitiesDialogFragment.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,9 +16,16 @@
 package io.timelimit.android.ui.manage.category.apps.addactivity
 
 import android.app.Dialog
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.appcompat.app.AlertDialog
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
@@ -114,9 +121,30 @@ class AddAppActivitiesDialogFragment: DialogFragment() {
             dismissAllowingStateLoss()
         }
 
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+
+            v.updateLayoutParams<MarginLayoutParams> {
+                topMargin = insets.top
+                bottomMargin = insets.bottom
+                leftMargin = insets.left
+                rightMargin = insets.right
+            }
+
+            WindowInsetsCompat.CONSUMED
+        }
+
         return AlertDialog.Builder(requireContext(), R.style.AppTheme)
-                .setView(binding.root)
-                .create()
+            .setView(binding.root)
+            .create()
+            .also { dialog ->
+                if (VERSION.SDK_INT >= VERSION_CODES.VANILLA_ICE_CREAM) dialog.setOnShowListener {
+                    WindowInsetsControllerCompat(dialog.window!!, binding.root).run {
+                        isAppearanceLightStatusBars = true
+                    }
+                }
+            }
     }
 
     fun show(fragmentManager: FragmentManager) = showSafe(fragmentManager, DIALOG_TAG)

From 11a47c5f30c3678a3c6a1e478b14473865a119f3 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 28 Oct 2024 01:00:00 +0100
Subject: [PATCH 02/23] Disable ActionBar in the theme

---
 app/src/main/java/io/timelimit/android/ui/MainActivity.kt     | 2 --
 .../main/java/io/timelimit/android/ui/lock/LockActivity.kt    | 4 ----
 .../io/timelimit/android/ui/manipulation/AnnoyActivity.kt     | 2 --
 .../java/io/timelimit/android/ui/update/UpdateActivity.kt     | 2 --
 app/src/main/res/values/styles.xml                            | 4 ++--
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/ui/MainActivity.kt b/app/src/main/java/io/timelimit/android/ui/MainActivity.kt
index 3bd2739..3872c24 100644
--- a/app/src/main/java/io/timelimit/android/ui/MainActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/MainActivity.kt
@@ -144,8 +144,6 @@ class MainActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
             )
         )
 
-        supportActionBar!!.hide()
-
         U2fManager.setupActivity(this)
 
         NotificationChannels.createNotificationChannels(getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager, this)
diff --git a/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt b/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
index 62e6c5d..634c77d 100644
--- a/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
@@ -120,8 +120,6 @@ class LockActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
             )
         )
 
-        supportActionBar!!.hide()
-
         U2fManager.setupActivity(this)
 
         val subtitleLive = syncModel.statusText.asFlow()
@@ -214,8 +212,6 @@ class LockActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
             }
         }
 
-        syncModel.statusText.observe(this) { supportActionBar?.subtitle = it }
-
         currentInstances.add(this)
 
         model.init(blockedPackageName, blockedActivityName)
diff --git a/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt b/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
index 6bf0fa7..721485a 100644
--- a/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
@@ -89,8 +89,6 @@ class AnnoyActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.D
             )
         )
 
-        supportActionBar!!.hide()
-
         setContent {
             Theme {
                 ScreenScaffold(
diff --git a/app/src/main/java/io/timelimit/android/ui/update/UpdateActivity.kt b/app/src/main/java/io/timelimit/android/ui/update/UpdateActivity.kt
index e213776..8698abd 100644
--- a/app/src/main/java/io/timelimit/android/ui/update/UpdateActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/update/UpdateActivity.kt
@@ -47,8 +47,6 @@ class UpdateActivity: AppCompatActivity() {
             )
         )
 
-        supportActionBar!!.hide()
-
         setContent {
             Theme {
                 ScreenScaffold(
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3e45a3a..26ab3fa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  TimeLimit Copyright <C> 2019 - 2020 Jonas Lochmann
+  TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation version 3 of the License.
@@ -15,7 +15,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorSecondary">@color/colorAccent</item>

From 8e02eb3fb346af8db04f33baf70401e0b9996071 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 28 Oct 2024 01:00:00 +0100
Subject: [PATCH 03/23] Move lockscreen tabs into the toolbar

---
 .../io/timelimit/android/ui/ScreenScaffold.kt | 101 +++++++++--------
 .../timelimit/android/ui/lock/LockActivity.kt | 103 +++++++++---------
 2 files changed, 104 insertions(+), 100 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/ui/ScreenScaffold.kt b/app/src/main/java/io/timelimit/android/ui/ScreenScaffold.kt
index 583136f..28139c0 100644
--- a/app/src/main/java/io/timelimit/android/ui/ScreenScaffold.kt
+++ b/app/src/main/java/io/timelimit/android/ui/ScreenScaffold.kt
@@ -51,6 +51,7 @@ fun ScreenScaffold(
     backStack: List<BackStackItem>,
     snackbarHostState: SnackbarHostState?,
     content: @Composable (PaddingValues) -> Unit,
+    extraBars: (@Composable () -> Unit)? = null,
     executeCommand: (UpdateStateCommand) -> Unit,
     showAuthenticationDialog: (() -> Unit)?
 ) {
@@ -58,69 +59,73 @@ fun ScreenScaffold(
 
     Scaffold(
         topBar = {
-            TopAppBar(
-                title = {
-                    Column {
-                        Text(
-                            title,
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis
-                        )
-
-                        if (subtitle != null) {
+            Column {
+                TopAppBar(
+                    title = {
+                        Column {
                             Text(
-                                subtitle,
-                                style = MaterialTheme.typography.subtitle1,
+                                title,
                                 maxLines = 1,
                                 overflow = TextOverflow.Ellipsis
                             )
-                        }
-                    }
-                },
-                navigationIcon = if (screen?.state?.previous != null) ({
-                    IconButton(onClick = { executeCommand(UpdateStateCommand.BackToPreviousScreen) }) {
-                        Icon(Icons.Default.ArrowBack, stringResource(R.string.generic_back))
-                    }
-                }) else null,
-                actions = {
-                    for (icon in screen?.toolbarIcons ?: emptyList()) {
-                        IconButton(
-                            onClick = {
-                                if (icon.action != null) executeCommand(icon.action)
 
-                                icon.handler()
+                            if (subtitle != null) {
+                                Text(
+                                    subtitle,
+                                    style = MaterialTheme.typography.subtitle1,
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis
+                                )
                             }
-                        ) {
-                            Icon(icon.icon, stringResource(icon.labelResource))
                         }
-                    }
+                    },
+                    navigationIcon = if (screen?.state?.previous != null) ({
+                        IconButton(onClick = { executeCommand(UpdateStateCommand.BackToPreviousScreen) }) {
+                            Icon(Icons.Default.ArrowBack, stringResource(R.string.generic_back))
+                        }
+                    }) else null,
+                    actions = {
+                        for (icon in screen?.toolbarIcons ?: emptyList()) {
+                            IconButton(
+                                onClick = {
+                                    if (icon.action != null) executeCommand(icon.action)
 
-                    if (screen?.toolbarOptions?.isEmpty() == false) {
-                        IconButton(onClick = { expandDropdown = true }) {
-                            Icon(Icons.Default.MoreVert, stringResource(R.string.generic_menu))
+                                    icon.handler()
+                                }
+                            ) {
+                                Icon(icon.icon, stringResource(icon.labelResource))
+                            }
                         }
 
-                        DropdownMenu(
-                            expanded = expandDropdown,
-                            onDismissRequest = { expandDropdown = false }
-                        ) {
-                            for (option in screen.toolbarOptions) {
-                                DropdownMenuItem(onClick = {
-                                    if (option.action != null) executeCommand(option.action)
+                        if (screen?.toolbarOptions?.isEmpty() == false) {
+                            IconButton(onClick = { expandDropdown = true }) {
+                                Icon(Icons.Default.MoreVert, stringResource(R.string.generic_menu))
+                            }
 
-                                    option.handler()
+                            DropdownMenu(
+                                expanded = expandDropdown,
+                                onDismissRequest = { expandDropdown = false }
+                            ) {
+                                for (option in screen.toolbarOptions) {
+                                    DropdownMenuItem(onClick = {
+                                        if (option.action != null) executeCommand(option.action)
 
-                                    expandDropdown = false
-                                }) {
-                                    Text(stringResource(option.labelResource))
+                                        option.handler()
+
+                                        expandDropdown = false
+                                    }) {
+                                        Text(stringResource(option.labelResource))
+                                    }
                                 }
                             }
                         }
-                    }
-                },
-                modifier = Modifier,
-                windowInsets = WindowInsets.statusBarsIgnoringVisibility
-            )
+                    },
+                    modifier = Modifier,
+                    windowInsets = WindowInsets.statusBarsIgnoringVisibility
+                )
+
+                extraBars?.invoke()
+            }
         },
         bottomBar = {
             val backStackColors = ButtonDefaults.textButtonColors(
diff --git a/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt b/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
index 634c77d..07861ff 100644
--- a/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
@@ -147,63 +147,62 @@ class LockActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
                     subtitle = subtitle,
                     backStack = emptyList(),
                     snackbarHostState = null,
-                    content = { padding ->
-                        Column (Modifier.fillMaxSize().padding(padding)) {
-                            TabRow(
-                                pager.currentPage,
-                                indicator = { tabPositions ->
-                                    // workaround for bug
-                                    TabRowDefaults.Indicator(
-                                        Modifier.tabIndicatorOffset(tabPositions[
-                                                pager.currentPage.coerceAtMost(tabPositions.size - 1)
-                                        ])
-                                    )
-                                }
+                    extraBars = {
+                        TabRow(
+                            pager.currentPage,
+                            indicator = { tabPositions ->
+                                // workaround for bug
+                                TabRowDefaults.Indicator(
+                                    Modifier.tabIndicatorOffset(tabPositions[
+                                        pager.currentPage.coerceAtMost(tabPositions.size - 1)
+                                    ])
+                                )
+                            }
+                        ) {
+                            Tab(
+                                selected = pager.currentPage == 0,
+                                onClick = { pager.requestScrollToPage(0) }
                             ) {
-                                Tab(
-                                    selected = pager.currentPage == 0,
-                                    onClick = { pager.requestScrollToPage(0) }
-                                ) {
-                                    Text(
-                                        stringResource(R.string.lock_tab_reason),
-                                        Modifier.padding(16.dp)
-                                    )
-                                }
-
-                                Tab(
-                                    selected = pager.currentPage == 1,
-                                    onClick = { pager.requestScrollToPage(1) }
-                                ) {
-                                    Text(
-                                        stringResource(R.string.lock_tab_action),
-                                        Modifier.padding(16.dp)
-                                    )
-                                }
-
-                                if (showTasks) Tab(
-                                    selected = pager.currentPage == 2,
-                                    onClick = { pager.requestScrollToPage(2) }
-                                ) {
-                                    Text(
-                                        stringResource(R.string.lock_tab_task),
-                                        Modifier.padding(16.dp)
-                                    )
-                                }
+                                Text(
+                                    stringResource(R.string.lock_tab_reason),
+                                    Modifier.padding(16.dp)
+                                )
                             }
 
-                            HorizontalPager(
-                                pager,
-                                Modifier.weight(1.0F, fill = true),
-                                pageContent = { index ->
-                                    when (index) {
-                                        0 -> AndroidFragment<LockReasonFragment>(Modifier.fillMaxSize())
-                                        1 -> AndroidFragment<LockActionFragment>(Modifier.fillMaxSize())
-                                        2 -> AndroidFragment<LockTaskFragment>(Modifier.fillMaxSize())
-                                    }
-                                }
-                            )
+                            Tab(
+                                selected = pager.currentPage == 1,
+                                onClick = { pager.requestScrollToPage(1) }
+                            ) {
+                                Text(
+                                    stringResource(R.string.lock_tab_action),
+                                    Modifier.padding(16.dp)
+                                )
+                            }
+
+                            if (showTasks) Tab(
+                                selected = pager.currentPage == 2,
+                                onClick = { pager.requestScrollToPage(2) }
+                            ) {
+                                Text(
+                                    stringResource(R.string.lock_tab_task),
+                                    Modifier.padding(16.dp)
+                                )
+                            }
                         }
                     },
+                    content = { padding ->
+                        HorizontalPager(
+                            pager,
+                            Modifier.fillMaxSize().padding(padding),
+                            pageContent = { index ->
+                                when (index) {
+                                    0 -> AndroidFragment<LockReasonFragment>(Modifier.fillMaxSize())
+                                    1 -> AndroidFragment<LockActionFragment>(Modifier.fillMaxSize())
+                                    2 -> AndroidFragment<LockTaskFragment>(Modifier.fillMaxSize())
+                                }
+                            }
+                        )
+                    },
                     executeCommand = {},
                     showAuthenticationDialog =
                     if (pager.currentPage == 1 && !isAuthenticated) ({ showAuthenticationScreen() })

From e54ff92cbbb7abb4907cf231a4f9e1b691956162 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 28 Oct 2024 01:00:00 +0100
Subject: [PATCH 04/23] Release 7.2.2

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ac9ed68..12ecdcc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,8 +30,8 @@ android {
         applicationId "io.timelimit.android"
         minSdkVersion 26
         targetSdkVersion 35
-        versionCode 220
-        versionName "7.2.1"
+        versionCode 221
+        versionName "7.2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         kapt {
             arguments {

From bd88da38d20db72827762d0802c2272ca64a833e Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 13 Jan 2025 01:00:00 +0100
Subject: [PATCH 05/23] Update copyright year

---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 880d308..239852d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
+  TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation version 3 of the License.
@@ -1649,7 +1649,7 @@
         <a href="https://legal.timelimit.io/en/privacy/">https://legal.timelimit.io/en/privacy/</a>
     </string>
     <string name="terms_gpl" translatable="false">
-        TimeLimit Copyright &#169; 2019 - 2024 Jonas Lochmann
+        TimeLimit Copyright &#169; 2019 - 2025 Jonas Lochmann
         \nThis program is free software: you can redistribute it and/or modify
         it under the terms of the GNU General Public License as published by
         the Free Software Foundation version 3 of the License.

From 73a82f3cf8a81c377a72c13ec51df8296c979ebd Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 13 Jan 2025 01:00:00 +0100
Subject: [PATCH 06/23] Update buildtools and dependencies

---
 app/build.gradle                         | 11 ++++++-----
 build.gradle                             |  8 ++++----
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 12ecdcc..7c07449 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@ plugins {
     id "androidx.navigation.safeargs.kotlin"
     id 'kotlin-kapt'
     id 'com.squareup.wire'
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.21"
 }
 
 android {
@@ -167,11 +168,11 @@ wire {
 dependencies {
     def nav_version = "2.5.3"
     def room_version = "2.6.1"
-    def work_version = '2.9.1'
+    def work_version = '2.10.0'
     def paging_version = "3.3.2"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21"
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.core:core:1.15.0'
     implementation 'androidx.cardview:cardview:1.0.0'
@@ -180,8 +181,8 @@ dependencies {
     implementation 'androidx.compose.material:material:1.7.5'
     implementation 'androidx.activity:activity-compose:1.9.3'
     implementation "com.google.accompanist:accompanist-flowlayout:0.30.0"
-    implementation 'androidx.compose.material:material-icons-extended:1.7.5'
-    debugImplementation "androidx.compose.ui:ui-tooling:1.7.5"
+    implementation 'androidx.compose.material:material-icons-extended:1.7.6'
+    debugImplementation "androidx.compose.ui:ui-tooling:1.7.6"
     implementation 'androidx.fragment:fragment-ktx:1.8.5'
     implementation 'androidx.fragment:fragment-compose:1.8.5'
 
diff --git a/build.gradle b/build.gradle
index 406bfde..27845eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,9 +15,9 @@
  */
 
 plugins {
-    id 'com.android.application' version '8.7.2' apply false
-    id 'com.android.library' version '8.7.2' apply false
-    id 'org.jetbrains.kotlin.android' version "1.9.21" apply false
+    id 'com.android.application' version '8.8.0' apply false
+    id 'com.android.library' version '8.8.0' apply false
+    id 'org.jetbrains.kotlin.android' version "2.0.21" apply false
     id 'com.google.devtools.ksp' version '1.9.21-1.0.16' apply false
     id 'androidx.navigation.safeargs' version '2.6.0' apply false
     id 'com.squareup.wire' version '4.4.3' apply false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bfe49c6..04ad34c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
-distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
\ No newline at end of file

From 2e68798e2c73c577d5e4542049389d4a327bb412 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 28 Apr 2025 02:00:00 +0200
Subject: [PATCH 07/23] Update buildtools and dependencies

---
 ...otlin-compiler-10945293377659253515.salive |  0
 app/build.gradle                              | 22 +++++++++----------
 .../manage/user/ManageDeviceUserScreen.kt     |  4 ++--
 .../android/ui/overview/overview/Device.kt    | 10 ++++-----
 .../android/ui/overview/overview/Intro.kt     | 12 +++++-----
 .../android/ui/overview/overview/User.kt      | 10 ++++-----
 build.gradle                                  |  4 ++--
 gradle/wrapper/gradle-wrapper.properties      |  4 ++--
 8 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 .kotlin/sessions/kotlin-compiler-10945293377659253515.salive

diff --git a/.kotlin/sessions/kotlin-compiler-10945293377659253515.salive b/.kotlin/sessions/kotlin-compiler-10945293377659253515.salive
new file mode 100644
index 0000000..e69de29
diff --git a/app/build.gradle b/app/build.gradle
index 7c07449..3816ea0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -167,24 +167,24 @@ wire {
 
 dependencies {
     def nav_version = "2.5.3"
-    def room_version = "2.6.1"
-    def work_version = '2.10.0'
-    def paging_version = "3.3.2"
+    def room_version = "2.7.1"
+    def work_version = '2.10.1'
+    def paging_version = "3.3.6"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21"
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.core:core:1.15.0'
+    implementation 'androidx.core:core:1.16.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.1.0'
     implementation "com.google.android.material:material:1.12.0"
-    implementation 'androidx.compose.material:material:1.7.5'
-    implementation 'androidx.activity:activity-compose:1.9.3'
+    implementation 'androidx.compose.material:material:1.8.0'
+    implementation 'androidx.activity:activity-compose:1.10.1'
     implementation "com.google.accompanist:accompanist-flowlayout:0.30.0"
-    implementation 'androidx.compose.material:material-icons-extended:1.7.6'
-    debugImplementation "androidx.compose.ui:ui-tooling:1.7.6"
-    implementation 'androidx.fragment:fragment-ktx:1.8.5'
-    implementation 'androidx.fragment:fragment-compose:1.8.5'
+    implementation 'androidx.compose.material:material-icons-extended:1.7.8'
+    debugImplementation "androidx.compose.ui:ui-tooling:1.8.0"
+    implementation 'androidx.fragment:fragment-ktx:1.8.6'
+    implementation 'androidx.fragment:fragment-compose:1.8.6'
 
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"
diff --git a/app/src/main/java/io/timelimit/android/ui/manage/device/manage/user/ManageDeviceUserScreen.kt b/app/src/main/java/io/timelimit/android/ui/manage/device/manage/user/ManageDeviceUserScreen.kt
index 7a9aeee..55cef2a 100644
--- a/app/src/main/java/io/timelimit/android/ui/manage/device/manage/user/ManageDeviceUserScreen.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manage/device/manage/user/ManageDeviceUserScreen.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2023 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ fun ManageDeviceUserScreen(
             Card(
                 onClick = { actions.select(item) },
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .fillMaxWidth(),
                 backgroundColor = when (item.selected) {
                     true -> MaterialTheme.colors.secondary
diff --git a/app/src/main/java/io/timelimit/android/ui/overview/overview/Device.kt b/app/src/main/java/io/timelimit/android/ui/overview/overview/Device.kt
index 5580924..2640d9e 100644
--- a/app/src/main/java/io/timelimit/android/ui/overview/overview/Device.kt
+++ b/app/src/main/java/io/timelimit/android/ui/overview/overview/Device.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2023 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ import io.timelimit.android.ui.model.main.OverviewHandling
 @OptIn(ExperimentalFoundationApi::class)
 fun LazyListScope.deviceItems(screen: OverviewHandling.OverviewScreen) {
     item (key = Pair("devices", "header")) {
-        ListCommon.SectionHeader(stringResource(R.string.overview_header_devices), Modifier.animateItemPlacement())
+        ListCommon.SectionHeader(stringResource(R.string.overview_header_devices), Modifier.animateItem())
     }
 
     items(screen.devices.list, key = { Pair("device", it.device.id) }) {
@@ -48,7 +48,7 @@ fun LazyListScope.deviceItems(screen: OverviewHandling.OverviewScreen) {
                 icon = Icons.Default.Add,
                 label = stringResource(R.string.add_device),
                 action = screen.actions.addDevice,
-                modifier = Modifier.animateItemPlacement()
+                modifier = Modifier.animateItem()
             )
         }
     }
@@ -56,7 +56,7 @@ fun LazyListScope.deviceItems(screen: OverviewHandling.OverviewScreen) {
     if (screen.devices.canShowMore != null) {
         item (key = Pair("devices", "more")) {
             ListCommon.ShowMoreItem(
-                modifier = Modifier.animateItemPlacement(),
+                modifier = Modifier.animateItem(),
                 action = { screen.actions.showMoreDevices(screen.devices.canShowMore) }
             )
         }
@@ -71,7 +71,7 @@ fun LazyItemScope.DeviceItem(
 ) {
     ListCardCommon.Card(
         Modifier
-            .animateItemPlacement()
+            .animateItem()
             .padding(horizontal = 8.dp)
             .clickable(onClick = { openAction(item) })
     ) {
diff --git a/app/src/main/java/io/timelimit/android/ui/overview/overview/Intro.kt b/app/src/main/java/io/timelimit/android/ui/overview/overview/Intro.kt
index 8099c13..b05a8d4 100644
--- a/app/src/main/java/io/timelimit/android/ui/overview/overview/Intro.kt
+++ b/app/src/main/java/io/timelimit/android/ui/overview/overview/Intro.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2023 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ fun LazyListScope.introItems(
         item (key = Pair("intro", "finish setup")) {
             ListCardCommon.Card(
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(horizontal = 8.dp)
             ) {
                 Text(
@@ -62,7 +62,7 @@ fun LazyListScope.introItems(
         item (key = Pair("intro", "outdated server")) {
             ListCardCommon.Card(
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(horizontal = 8.dp)
             ) {
                 Text(
@@ -79,7 +79,7 @@ fun LazyListScope.introItems(
         item (key = Pair("intro", "server message")) {
             ListCardCommon.Card(
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(horizontal = 8.dp)
             ) {
                 Text(
@@ -108,7 +108,7 @@ fun LazyListScope.introItems(
             SwipeToDismiss(
                 state = state,
                 background = {},
-                modifier = Modifier.animateItemPlacement()
+                modifier = Modifier.animateItem()
             ) {
                 ListCardCommon.Card(
                     modifier = Modifier.padding(horizontal = 8.dp)
@@ -133,7 +133,7 @@ fun LazyListScope.introItems(
         item (key = Pair("intro", "task review")) {
             ListCardCommon.Card(
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(horizontal = 8.dp)
             ) {
                 Text(
diff --git a/app/src/main/java/io/timelimit/android/ui/overview/overview/User.kt b/app/src/main/java/io/timelimit/android/ui/overview/overview/User.kt
index 7cd85d5..7805783 100644
--- a/app/src/main/java/io/timelimit/android/ui/overview/overview/User.kt
+++ b/app/src/main/java/io/timelimit/android/ui/overview/overview/User.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2023 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ import io.timelimit.android.ui.model.main.OverviewHandling
 @OptIn(ExperimentalFoundationApi::class)
 fun LazyListScope.userItems(screen: OverviewHandling.OverviewScreen) {
     item (key = Pair("users", "header")) {
-        ListCommon.SectionHeader(stringResource(R.string.overview_header_users), Modifier.animateItemPlacement())
+        ListCommon.SectionHeader(stringResource(R.string.overview_header_users), Modifier.animateItem())
     }
 
     items(screen.users.list, key = { Pair("user", it.id) }) { UserItem(it, screen.actions) }
@@ -45,13 +45,13 @@ fun LazyListScope.userItems(screen: OverviewHandling.OverviewScreen) {
             icon = Icons.Default.Add,
             label = stringResource(R.string.add_user_title),
             action = screen.actions.addUser,
-            modifier = Modifier.animateItemPlacement()
+            modifier = Modifier.animateItem()
         )
     }
 
     if (screen.users.canShowMore) item (key = Pair("users", "more")) {
         ListCommon.ShowMoreItem (
-            modifier = Modifier.animateItemPlacement(),
+            modifier = Modifier.animateItem(),
             action = screen.actions.showMoreUsers
         )
     }
@@ -65,7 +65,7 @@ fun LazyItemScope.UserItem(
 ) {
     ListCardCommon.Card(
         Modifier
-            .animateItemPlacement()
+            .animateItem()
             .padding(horizontal = 8.dp)
             .clickable(onClick = { actions.openUser(user) })
     ) {
diff --git a/build.gradle b/build.gradle
index 27845eb..b574be7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id 'com.android.application' version '8.8.0' apply false
-    id 'com.android.library' version '8.8.0' apply false
+    id 'com.android.application' version '8.9.2' apply false
+    id 'com.android.library' version '8.9.2' apply false
     id 'org.jetbrains.kotlin.android' version "2.0.21" apply false
     id 'com.google.devtools.ksp' version '1.9.21-1.0.16' apply false
     id 'androidx.navigation.safeargs' version '2.6.0' apply false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04ad34c..c6c1c0c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
-distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionSha256Sum=89d4e70e4e84e2d2dfbb63e4daa53e21b25017cc70c37e4eea31ee51fb15098a
\ No newline at end of file

From de0b6d1c8f0f09d2ce44913a49ac4f09a2b713e1 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 28 Apr 2025 02:00:00 +0200
Subject: [PATCH 08/23] Fix parsing u2f counter bytes >= 0x80

---
 .../io/timelimit/android/u2f/protocol/U2FResponse.kt   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/u2f/protocol/U2FResponse.kt b/app/src/main/java/io/timelimit/android/u2f/protocol/U2FResponse.kt
index ee43d8c..84afa7b 100644
--- a/app/src/main/java/io/timelimit/android/u2f/protocol/U2FResponse.kt
+++ b/app/src/main/java/io/timelimit/android/u2f/protocol/U2FResponse.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -64,10 +64,10 @@ object U2FResponse {
 
                 val flags = rawResponse.payload[0]
 
-                val counter = rawResponse.payload[4].toUInt() or
-                        rawResponse.payload[3].toUInt().shl(8) or
-                        rawResponse.payload[2].toUInt().shl(16) or
-                        rawResponse.payload[1].toUInt().shl(24)
+                val counter = rawResponse.payload[4].toUByte().toUInt() or
+                        rawResponse.payload[3].toUByte().toUInt().shl(8) or
+                        rawResponse.payload[2].toUByte().toUInt().shl(16) or
+                        rawResponse.payload[1].toUByte().toUInt().shl(24)
 
                 val signature = rawResponse.payload.sliceArray(5 until rawResponse.payload.size)
 

From a36ffa861ab943e2b32828e149b2ff03f20d10a2 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 28 Apr 2025 02:00:00 +0200
Subject: [PATCH 09/23] remove obsolete tests

---
 .../blocked_times/MinutesOfWeekItemsTest.kt   | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 app/src/test/java/io/timelimit/android/ui/manage/category/blocked_times/MinutesOfWeekItemsTest.kt

diff --git a/app/src/test/java/io/timelimit/android/ui/manage/category/blocked_times/MinutesOfWeekItemsTest.kt b/app/src/test/java/io/timelimit/android/ui/manage/category/blocked_times/MinutesOfWeekItemsTest.kt
deleted file mode 100644
index c712f0d..0000000
--- a/app/src/test/java/io/timelimit/android/ui/manage/category/blocked_times/MinutesOfWeekItemsTest.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.timelimit.android.ui.manage.category.blocked_times
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class MinutesOfWeekItemsTest {
-    @Test
-    fun canGetAllItems() {
-        for (i in 0 until MinuteOfWeekItems.itemsPerWeek) {
-            MinuteOfWeekItems.getItemAtPosition(i)
-        }
-    }
-
-    @Test
-    fun reverseLookupReturnsSameItem() {
-        for (i in 0 until MinuteOfWeekItems.itemsPerWeek) {
-            val item = MinuteOfWeekItems.getItemAtPosition(i)
-            val index = MinuteOfWeekItems.getPositionOfItem(item)
-
-            assertEquals(item.toString(), i, index)
-        }
-    }
-}
\ No newline at end of file

From daff66b26becf37e178bfa29867c66f641a0334e Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 5 May 2025 02:00:00 +0200
Subject: [PATCH 10/23] remove generated file

---
 .kotlin/sessions/kotlin-compiler-10945293377659253515.salive | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .kotlin/sessions/kotlin-compiler-10945293377659253515.salive

diff --git a/.kotlin/sessions/kotlin-compiler-10945293377659253515.salive b/.kotlin/sessions/kotlin-compiler-10945293377659253515.salive
deleted file mode 100644
index e69de29..0000000

From 801bf760dcbf81fe5136087b081f4b3205b82b50 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 5 May 2025 02:00:00 +0200
Subject: [PATCH 11/23] update buildtools

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b574be7..c701c41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id 'com.android.application' version '8.9.2' apply false
-    id 'com.android.library' version '8.9.2' apply false
+    id 'com.android.application' version '8.10.0' apply false
+    id 'com.android.library' version '8.10.0' apply false
     id 'org.jetbrains.kotlin.android' version "2.0.21" apply false
     id 'com.google.devtools.ksp' version '1.9.21-1.0.16' apply false
     id 'androidx.navigation.safeargs' version '2.6.0' apply false

From d02631d5c117326d21034aaeab2a4745972cc7ba Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 5 May 2025 02:00:00 +0200
Subject: [PATCH 12/23] Update dependencies

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3816ea0..9ed1828 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -178,11 +178,11 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.1.0'
     implementation "com.google.android.material:material:1.12.0"
-    implementation 'androidx.compose.material:material:1.8.0'
+    implementation 'androidx.compose.material:material:1.8.1'
     implementation 'androidx.activity:activity-compose:1.10.1'
     implementation "com.google.accompanist:accompanist-flowlayout:0.30.0"
     implementation 'androidx.compose.material:material-icons-extended:1.7.8'
-    debugImplementation "androidx.compose.ui:ui-tooling:1.8.0"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.8.1"
     implementation 'androidx.fragment:fragment-ktx:1.8.6'
     implementation 'androidx.fragment:fragment-compose:1.8.6'
 

From 5f69014850768e14bd437dae7b56bf6b60f3c821 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 5 May 2025 02:00:00 +0200
Subject: [PATCH 13/23] Release 7.2.3

---
 app/build.gradle                 | 4 ++--
 app/src/main/play/de-DE/whatsnew | 3 +--
 app/src/main/play/en-US/whatsnew | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9ed1828..83c7f29 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         applicationId "io.timelimit.android"
         minSdkVersion 26
         targetSdkVersion 35
-        versionCode 221
-        versionName "7.2.2"
+        versionCode 222
+        versionName "7.2.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         kapt {
             arguments {
diff --git a/app/src/main/play/de-DE/whatsnew b/app/src/main/play/de-DE/whatsnew
index 7996b5a..f5d6fa0 100644
--- a/app/src/main/play/de-DE/whatsnew
+++ b/app/src/main/play/de-DE/whatsnew
@@ -1,3 +1,2 @@
-- Anpassungen für Android 15
-- falsch angezeigte Nutzungsdauer bei Regeln die je Tag gelten an Tagen, an denen diese nicht gelten, behoben
+- Probleme bei der Signaturprüfung bei der Verwendung von Hardwaretoken behoben
 - enthaltene Komponenten aktualisiert
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 09107ef..53e7a88 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1,3 +1,2 @@
-- adjustments for Android 15
-- fix incorrect used time at rules that apply per day at days where they do not apply
+- fix issues during hardware token signature verification
 - update contained software

From f4c35dec550176f1ac1d1ad12016de6decbf2c93 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 16 Jun 2025 02:00:00 +0200
Subject: [PATCH 14/23] Update dependencies

---
 app/build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 83c7f29..7b127ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -167,24 +167,24 @@ wire {
 
 dependencies {
     def nav_version = "2.5.3"
-    def room_version = "2.7.1"
-    def work_version = '2.10.1'
+    def room_version = "2.7.2"
+    def work_version = '2.10.2'
     def paging_version = "3.3.6"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21"
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'androidx.core:core:1.16.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.1.0'
     implementation "com.google.android.material:material:1.12.0"
-    implementation 'androidx.compose.material:material:1.8.1'
+    implementation 'androidx.compose.material:material:1.8.3'
     implementation 'androidx.activity:activity-compose:1.10.1'
     implementation "com.google.accompanist:accompanist-flowlayout:0.30.0"
     implementation 'androidx.compose.material:material-icons-extended:1.7.8'
-    debugImplementation "androidx.compose.ui:ui-tooling:1.8.1"
-    implementation 'androidx.fragment:fragment-ktx:1.8.6'
-    implementation 'androidx.fragment:fragment-compose:1.8.6'
+    debugImplementation "androidx.compose.ui:ui-tooling:1.8.3"
+    implementation 'androidx.fragment:fragment-ktx:1.8.8'
+    implementation 'androidx.fragment:fragment-compose:1.8.8'
 
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"

From acdd83c39a166686e10d3e0915ba8b6509906c04 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 23 Jun 2025 18:23:40 +0200
Subject: [PATCH 15/23] Update build tools

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index c701c41..79b050c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id 'com.android.application' version '8.10.0' apply false
-    id 'com.android.library' version '8.10.0' apply false
+    id 'com.android.application' version '8.10.1' apply false
+    id 'com.android.library' version '8.10.1' apply false
     id 'org.jetbrains.kotlin.android' version "2.0.21" apply false
     id 'com.google.devtools.ksp' version '1.9.21-1.0.16' apply false
     id 'androidx.navigation.safeargs' version '2.6.0' apply false

From 53732e47ddb6698c6a32be4d58bbff566e4dabbd Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 23 Jun 2025 18:29:22 +0200
Subject: [PATCH 16/23] catch SecurityException caused by adjusting sensor
 related permissions

---
 .../platform/android/AndroidDeviceOwnerApi.kt | 18 +++++++++---
 .../platform/android/AndroidIntegration.kt    | 28 ++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidDeviceOwnerApi.kt b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidDeviceOwnerApi.kt
index 34a5814..44bbc15 100644
--- a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidDeviceOwnerApi.kt
+++ b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidDeviceOwnerApi.kt
@@ -134,9 +134,19 @@ class AndroidDeviceOwnerApi(
         if (VERSION.SDK_INT < VERSION_CODES.LOLLIPOP) return false
         if (!devicePolicyManager.isDeviceOwnerApp(componentName.packageName)) return false
 
-        return devicePolicyManager.setPermissionGrantState(
-            componentName, componentName.packageName, Manifest.permission.ACCESS_FINE_LOCATION,
-            DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED
-        )
+        try {
+            return devicePolicyManager.setPermissionGrantState(
+                componentName, componentName.packageName, Manifest.permission.ACCESS_FINE_LOCATION,
+                DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED
+            )
+        } catch (ex: SecurityException) {
+            // set to default so that granting this manually is possible
+            devicePolicyManager.setPermissionGrantState(
+                componentName, componentName.packageName, Manifest.permission.ACCESS_FINE_LOCATION,
+                DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT
+            )
+
+            return false
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt
index bb43054..4170731 100644
--- a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt
+++ b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt
@@ -519,16 +519,24 @@ class AndroidIntegration(context: Context): PlatformIntegration(maximumProtectio
                     context.packageName,
                     Manifest.permission.ACCESS_FINE_LOCATION,
                 ).let {
-                    if (it == DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT) {
-                        policyManager.setPermissionGrantState(
-                            deviceAdmin,
-                            context.packageName,
-                            Manifest.permission.ACCESS_FINE_LOCATION,
-                            if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED)
-                                DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED
-                            else
-                                DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED
-                        )
+                    try {
+                        if (it == DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT) {
+                            policyManager.setPermissionGrantState(
+                                deviceAdmin,
+                                context.packageName,
+                                Manifest.permission.ACCESS_FINE_LOCATION,
+                                if (ContextCompat.checkSelfPermission(
+                                        context,
+                                        Manifest.permission.ACCESS_FINE_LOCATION
+                                    ) == PackageManager.PERMISSION_GRANTED
+                                )
+                                    DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED
+                                else
+                                    DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED
+                            )
+                        }
+                    } catch (ex: SecurityException) {
+                        // ignore
                     }
                 }
 

From 6ba96145579e9b7e2aa26a7404939fa189037d11 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 23 Jun 2025 02:00:00 +0200
Subject: [PATCH 17/23] Release 7.2.4

---
 app/build.gradle                 | 4 ++--
 app/src/main/play/de-DE/whatsnew | 2 +-
 app/src/main/play/en-US/whatsnew | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7b127ef..74ed051 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         applicationId "io.timelimit.android"
         minSdkVersion 26
         targetSdkVersion 35
-        versionCode 222
-        versionName "7.2.3"
+        versionCode 223
+        versionName "7.2.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         kapt {
             arguments {
diff --git a/app/src/main/play/de-DE/whatsnew b/app/src/main/play/de-DE/whatsnew
index f5d6fa0..bc76ab2 100644
--- a/app/src/main/play/de-DE/whatsnew
+++ b/app/src/main/play/de-DE/whatsnew
@@ -1,2 +1,2 @@
-- Probleme bei der Signaturprüfung bei der Verwendung von Hardwaretoken behoben
+- Abstürze in bestimmten Fällen behoben
 - enthaltene Komponenten aktualisiert
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 53e7a88..74e5016 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1,2 +1,2 @@
-- fix issues during hardware token signature verification
+- fix crashes in specific scenarios
 - update contained software

From abe6d47a96b70f4d6ff0e5b85d1335cc9caba9dd Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 21 Jul 2025 02:00:00 +0200
Subject: [PATCH 18/23] Add new restrictions that can be set by the device
 owner

---
 .../android/data/model/ConfigurationItem.kt   |  5 ++-
 .../data/model/derived/DeviceRelatedData.kt   |  3 +-
 .../platform/android/AndroidFeatures.kt       | 42 ++++++++++++++++++-
 .../platform/android/AndroidIntegration.kt    |  2 -
 .../timelimit/android/logic/AppSetupLogic.kt  |  7 +++-
 .../android/logic/SuspendAppsLogic.kt         | 29 ++++++++++---
 .../ui/model/setup/SetupParentHandling.kt     |  8 +++-
 .../setup/child/SetupRemoteChildViewModel.kt  |  8 +++-
 app/src/main/res/values-de/strings.xml        |  6 ++-
 app/src/main/res/values/strings.xml           |  4 ++
 10 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/data/model/ConfigurationItem.kt b/app/src/main/java/io/timelimit/android/data/model/ConfigurationItem.kt
index 9f9e743..b5db91e 100644
--- a/app/src/main/java/io/timelimit/android/data/model/ConfigurationItem.kt
+++ b/app/src/main/java/io/timelimit/android/data/model/ConfigurationItem.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -295,4 +295,7 @@ object ExperimentalFlags {
 
 object ConsentFlags {
     const val APP_LIST_SYNC = 1L
+
+    // this is used internally
+    const val BLOCK_USER_SWITCH_BY_DEFAULT = 2L
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/timelimit/android/data/model/derived/DeviceRelatedData.kt b/app/src/main/java/io/timelimit/android/data/model/derived/DeviceRelatedData.kt
index e168684..858d667 100644
--- a/app/src/main/java/io/timelimit/android/data/model/derived/DeviceRelatedData.kt
+++ b/app/src/main/java/io/timelimit/android/data/model/derived/DeviceRelatedData.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,4 +73,5 @@ data class DeviceRelatedData (
     }
 
     fun isExperimentalFlagSetSync(flags: Long) = (experimentalFlags and flags) == flags
+    fun isConsentFlagSet(flags: Long) = (consentFlags and flags) == flags
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidFeatures.kt b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidFeatures.kt
index d5fcef9..97cc81a 100644
--- a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidFeatures.kt
+++ b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidFeatures.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,10 @@ import io.timelimit.android.integration.platform.PlatformFeature
 object AndroidFeatures {
     private const val FEATURE_ADB = "adb"
     private const val FEATURE_CONFIG_PRIVATE_DNS = "dns"
+    const val FEATURE_ADD_USER = "add_user"
+    const val FEATURE_USER_SWITCH = "user_switch"
+    private const val FEATURE_VPN = "vpn"
+    private const val FEATURE_UNKNOWN_SOURCES = "unknown_sources"
 
     fun applyBlockedFeatures(features: Set<String>, policyManager: DevicePolicyManager, admin: ComponentName): Boolean {
         fun apply(feature: String, restriction: String) {
@@ -40,6 +44,18 @@ object AndroidFeatures {
             apply(FEATURE_CONFIG_PRIVATE_DNS, UserManager.DISALLOW_CONFIG_PRIVATE_DNS)
         }
 
+        apply(FEATURE_ADD_USER, UserManager.DISALLOW_ADD_USER)
+
+        if (VERSION.SDK_INT >= VERSION_CODES.P) {
+            apply(FEATURE_USER_SWITCH, UserManager.DISALLOW_USER_SWITCH)
+        }
+
+        apply(FEATURE_VPN, UserManager.DISALLOW_CONFIG_VPN)
+
+        if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+            apply(FEATURE_UNKNOWN_SOURCES, UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY)
+        }
+
         return true
     }
 
@@ -60,6 +76,30 @@ object AndroidFeatures {
             )
         }
 
+        result.add(PlatformFeature(
+            id = FEATURE_ADD_USER,
+            title = context.getString(R.string.dummy_app_feature_add_user)
+        ))
+
+        if (VERSION.SDK_INT >= VERSION_CODES.P) {
+            result.add(PlatformFeature(
+                id = FEATURE_USER_SWITCH,
+                title = context.getString(R.string.dummy_app_feature_switch_user)
+            ))
+        }
+
+        result.add(PlatformFeature(
+            id = FEATURE_VPN,
+            title = context.getString(R.string.dummy_app_feature_vpn)
+        ))
+
+        if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+            result.add(PlatformFeature(
+                id = FEATURE_UNKNOWN_SOURCES,
+                title = context.getString(R.string.dummy_app_feature_unknown_sources)
+            ))
+        }
+
         return result
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt
index 4170731..cce566b 100644
--- a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt
+++ b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt
@@ -507,7 +507,6 @@ class AndroidIntegration(context: Context): PlatformIntegration(maximumProtectio
 
             if (enableLockdown) {
                 // disable problematic features
-                policyManager.addUserRestriction(deviceAdmin, UserManager.DISALLOW_ADD_USER)
                 policyManager.addUserRestriction(deviceAdmin, UserManager.DISALLOW_FACTORY_RESET)
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -557,7 +556,6 @@ class AndroidIntegration(context: Context): PlatformIntegration(maximumProtectio
                 }
             } else /* disable lockdown */ {
                 // enable problematic features
-                policyManager.clearUserRestriction(deviceAdmin, UserManager.DISALLOW_ADD_USER)
                 policyManager.clearUserRestriction(deviceAdmin, UserManager.DISALLOW_FACTORY_RESET)
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
diff --git a/app/src/main/java/io/timelimit/android/logic/AppSetupLogic.kt b/app/src/main/java/io/timelimit/android/logic/AppSetupLogic.kt
index 89e02b2..eaca44d 100644
--- a/app/src/main/java/io/timelimit/android/logic/AppSetupLogic.kt
+++ b/app/src/main/java/io/timelimit/android/logic/AppSetupLogic.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,6 +65,11 @@ class AppSetupLogic(private val appLogic: AppLogic) {
                     appLogic.database.deleteAllData()
 
                     appLogic.database.config().setCustomServerUrlSync(customServerUrl)
+
+                    appLogic.database.config().setConsentFlagSync(
+                        ConsentFlags.BLOCK_USER_SWITCH_BY_DEFAULT,
+                        true
+                    )
                 }
 
                 run {
diff --git a/app/src/main/java/io/timelimit/android/logic/SuspendAppsLogic.kt b/app/src/main/java/io/timelimit/android/logic/SuspendAppsLogic.kt
index 9807629..b7385a2 100644
--- a/app/src/main/java/io/timelimit/android/logic/SuspendAppsLogic.kt
+++ b/app/src/main/java/io/timelimit/android/logic/SuspendAppsLogic.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,10 +19,12 @@ import io.timelimit.android.async.Threads
 import io.timelimit.android.data.invalidation.Observer
 import io.timelimit.android.data.invalidation.Table
 import io.timelimit.android.data.model.CategoryApp
+import io.timelimit.android.data.model.ConsentFlags
 import io.timelimit.android.data.model.ExperimentalFlags
 import io.timelimit.android.data.model.UserType
 import io.timelimit.android.data.model.derived.UserRelatedData
 import io.timelimit.android.integration.platform.ProtectionLevel
+import io.timelimit.android.integration.platform.android.AndroidFeatures
 import io.timelimit.android.integration.platform.android.AndroidIntegrationApps
 import io.timelimit.android.logic.blockingreason.CategoryHandlingCache
 import java.lang.ref.WeakReference
@@ -107,12 +109,23 @@ class SuspendAppsLogic(private val appLogic: AppLogic): Observer {
         val hasManagedFeatures = featureCategoryApps.isNotEmpty()
         val enableBlocking = isRestrictedUser && (enableBlockingAtSystemLevel || hasManagedFeatures)
 
+        val blockUserSwitchByDefault =
+            userAndDeviceRelatedData?.deviceRelatedData?.isConsentFlagSet(ConsentFlags.BLOCK_USER_SWITCH_BY_DEFAULT) == true
+                    && userAndDeviceRelatedData.userRelatedData?.user?.type == UserType.Child
+
+        val featureToAllowDefaults = mapOf(
+            AndroidFeatures.FEATURE_ADD_USER to false,
+            AndroidFeatures.FEATURE_USER_SWITCH to !blockUserSwitchByDefault
+        )
+
         if (!enableBlocking) {
             lastDefaultCategory = null
             lastAllowedCategoryList = emptySet()
             lastCategoryApps = emptyList()
             applySuspendedApps(emptyList())
-            applyBlockedFeatures(emptySet())
+            applyBlockedFeatures(
+                featureToAllowDefaults.filter { !it.value }.map { it.key }.toSet()
+            )
 
             return
         }
@@ -191,9 +204,15 @@ class SuspendAppsLogic(private val appLogic: AppLogic): Observer {
             val deviceSpecificFeatureIdentifiers = deviceSpecificFeatures.map { it.appSpecifierString }.toSet()
             val globalFeatures = featureCategoryApps.filter { !deviceSpecificFeatureIdentifiers.contains(it.appSpecifierString) }
             val effectiveFeatures = deviceSpecificFeatures + globalFeatures
-            val featuresToBlock = effectiveFeatures.filter { !categoryIdsToAllow.contains(it.categoryId) }
-                .map { it.appSpecifierString.substring(DummyApps.FEATURE_APP_PREFIX.length) }
-                .toSet()
+
+            val featuresToAllow = featureToAllowDefaults + effectiveFeatures.associate {
+                Pair(
+                    it.appSpecifierString.substring(DummyApps.FEATURE_APP_PREFIX.length),
+                    categoryIdsToAllow.contains(it.categoryId)
+                )
+            }
+
+            val featuresToBlock = featuresToAllow.filter { !it.value }.map { it.key }.toSet()
 
             applySuspendedApps(appsToBlock)
             applyBlockedFeatures(featuresToBlock)
diff --git a/app/src/main/java/io/timelimit/android/ui/model/setup/SetupParentHandling.kt b/app/src/main/java/io/timelimit/android/ui/model/setup/SetupParentHandling.kt
index b29c7cc..38ccee1 100644
--- a/app/src/main/java/io/timelimit/android/ui/model/setup/SetupParentHandling.kt
+++ b/app/src/main/java/io/timelimit/android/ui/model/setup/SetupParentHandling.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ import io.timelimit.android.async.Threads
 import io.timelimit.android.coroutines.executeAndWait
 import io.timelimit.android.data.backup.DatabaseBackup
 import io.timelimit.android.data.devicename.DeviceName
+import io.timelimit.android.data.model.ConsentFlags
 import io.timelimit.android.logic.AppLogic
 import io.timelimit.android.sync.ApplyServerDataStatus
 import io.timelimit.android.sync.network.NewDeviceInfo
@@ -333,6 +334,11 @@ object SetupParentHandling {
                         database.config().setDeviceAuthTokenSync(result.deviceAuthToken)
                         database.config().setEnableBackgroundSync(state.backgroundSync)
 
+                        database.config().setConsentFlagSync(
+                            ConsentFlags.BLOCK_USER_SWITCH_BY_DEFAULT,
+                            true
+                        )
+
                         ApplyServerDataStatus.applyServerDataStatusSync(result.serverDataStatus, logic.database, logic.platformIntegration)
                     }
                 }
diff --git a/app/src/main/java/io/timelimit/android/ui/setup/child/SetupRemoteChildViewModel.kt b/app/src/main/java/io/timelimit/android/ui/setup/child/SetupRemoteChildViewModel.kt
index 6fa11ca..392a0b5 100644
--- a/app/src/main/java/io/timelimit/android/ui/setup/child/SetupRemoteChildViewModel.kt
+++ b/app/src/main/java/io/timelimit/android/ui/setup/child/SetupRemoteChildViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2023 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ import io.timelimit.android.coroutines.executeAndWait
 import io.timelimit.android.coroutines.runAsync
 import io.timelimit.android.data.backup.DatabaseBackup
 import io.timelimit.android.data.devicename.DeviceName
+import io.timelimit.android.data.model.ConsentFlags
 import io.timelimit.android.livedata.castDown
 import io.timelimit.android.logic.AppLogic
 import io.timelimit.android.logic.DefaultAppLogic
@@ -70,6 +71,11 @@ class SetupRemoteChildViewModel(application: Application): AndroidViewModel(appl
                         logic.database.config().setOwnDeviceIdSync(registerResponse.ownDeviceId)
                         logic.database.config().setDeviceAuthTokenSync(registerResponse.deviceAuthToken)
 
+                        logic.database.config().setConsentFlagSync(
+                            ConsentFlags.BLOCK_USER_SWITCH_BY_DEFAULT,
+                            true
+                        )
+
                         ApplyServerDataStatus.applyServerDataStatusSync(clientStatusResponse, logic.database, logic.platformIntegration)
                     }
                 }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cf95126..17198eb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
+  TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation version 3 of the License.
@@ -1752,6 +1752,10 @@
     <string name="dummy_app_unassigned_system_image_app">nicht zugeordnete Apps von der Systempartition</string>
     <string name="dummy_app_feature_adb">Entwickleroptionen</string>
     <string name="dummy_app_feature_dns">DNS-Einstellungen</string>
+    <string name="dummy_app_feature_add_user">Systembenutzer erstellen</string>
+    <string name="dummy_app_feature_switch_user">Systembenutzer wechseln</string>
+    <string name="dummy_app_feature_vpn">VPN konfigurieren</string>
+    <string name="dummy_app_feature_unknown_sources">Apps aus unbekannten Quellen installieren</string>
     <string name="dummy_app_activity_audio">Hintergrundmusikwiedergabe</string>
 
     <string name="notify_permission_title">Benachrichtigungen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 239852d..c8db5fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1804,6 +1804,10 @@
     <string name="dummy_app_unassigned_system_image_app">not assigned Apps from the system image</string>
     <string name="dummy_app_feature_adb">Developer Options</string>
     <string name="dummy_app_feature_dns">DNS Settings</string>
+    <string name="dummy_app_feature_add_user">Create System User</string>
+    <string name="dummy_app_feature_switch_user">Switch System User</string>
+    <string name="dummy_app_feature_vpn">Configure VPN</string>
+    <string name="dummy_app_feature_unknown_sources">Install Apps from unknown sources</string>
     <string name="dummy_app_activity_audio">Background Audio Playback</string>
 
     <string name="notify_permission_title">Notifications</string>

From 3d49bd822970024031b77e3ca5ee2032ddd22414 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 21 Jul 2025 02:00:00 +0200
Subject: [PATCH 19/23] Update buildtools and dependencies

---
 app/build.gradle                                       | 10 +++++-----
 .../java/io/timelimit/android/data/dao/UsedTimeDao.kt  |  6 +++---
 build.gradle                                           |  6 +++---
 gradle/wrapper/gradle-wrapper.properties               |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 74ed051..d4597b0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ plugins {
     id "androidx.navigation.safeargs.kotlin"
     id 'kotlin-kapt'
     id 'com.squareup.wire'
-    id("org.jetbrains.kotlin.plugin.compose") version "2.0.21"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.1.10"
 }
 
 android {
@@ -172,7 +172,7 @@ dependencies {
     def paging_version = "3.3.6"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10"
     implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'androidx.core:core:1.16.0'
     implementation 'androidx.cardview:cardview:1.0.0'
@@ -201,8 +201,8 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$work_version"
     // androidTestImplementation "android.arch.work:work-testing:$work_version"
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.6.2'
@@ -230,5 +230,5 @@ dependencies {
 
     implementation 'com.google.zxing:core:3.3.3'
 
-    api "com.squareup.wire:wire-runtime:4.4.3"
+    api "com.squareup.wire:wire-runtime:5.3.5"
 }
diff --git a/app/src/main/java/io/timelimit/android/data/dao/UsedTimeDao.kt b/app/src/main/java/io/timelimit/android/data/dao/UsedTimeDao.kt
index 8b707f8..3c34d23 100644
--- a/app/src/main/java/io/timelimit/android/data/dao/UsedTimeDao.kt
+++ b/app/src/main/java/io/timelimit/android/data/dao/UsedTimeDao.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -69,13 +69,13 @@ abstract class UsedTimeDao {
 
     // breaking it into multiple lines causes issues during compilation ...
     // this warns about an unused column, but this column is used in the ORDER BY
-    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
+    @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Query("SELECT 2 AS type, start_time_of_day AS startMinuteOfDay, end_time_of_day AS endMinuteOfDay, used_time AS duration, day_of_epoch AS day, NULL AS lastUsage, NULL AS maxSessionDuration, NULL AS pauseDuration, category.id AS categoryId, category.title AS categoryTitle FROM used_time JOIN category ON (used_time.category_id = category.id) WHERE category.id = :categoryId UNION ALL SELECT 1 AS type, start_minute_of_day AS startMinuteOfDay, end_minute_of_day AS endMinuteOfDay, last_session_duration AS duration, NULL AS day, last_usage AS lastUsage, max_session_duration AS maxSessionDuration, session_pause_duration AS pauseDuration, category.id AS categoryId, category.title AS categoryTitle FROM session_duration JOIN category ON (session_duration.category_id = category.id) WHERE category.id = :categoryId ORDER BY type, day DESC, lastUsage DESC, startMinuteOfDay, endMinuteOfDay, categoryId")
     abstract fun getUsedTimeListItemsByCategoryId(categoryId: String): Flow<List<UsedTimeListItem>>
 
     // breaking it into multiple lines causes issues during compilation ...
     // this warns about an unused column, but this column is used in the ORDER BY
-    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
+    @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Query("SELECT 2 AS type, start_time_of_day AS startMinuteOfDay, end_time_of_day AS endMinuteOfDay, used_time AS duration, day_of_epoch AS day, NULL AS lastUsage, NULL AS maxSessionDuration, NULL AS pauseDuration, category.id AS categoryId, category.title AS categoryTitle FROM used_time JOIN category ON (used_time.category_id = category.id) WHERE category.child_id = :userId UNION ALL SELECT 1 AS type, start_minute_of_day AS startMinuteOfDay, end_minute_of_day AS endMinuteOfDay, last_session_duration AS duration, NULL AS day, last_usage AS lastUsage, max_session_duration AS maxSessionDuration, session_pause_duration AS pauseDuration, category.id AS categoryId, category.title AS categoryTitle FROM session_duration JOIN category ON (session_duration.category_id = category.id) WHERE category.child_id = :userId ORDER BY type, day DESC, lastUsage DESC, startMinuteOfDay, endMinuteOfDay, categoryId")
     abstract fun getUsedTimeListItemsByUserId(userId: String): Flow<List<UsedTimeListItem>>
 }
diff --git a/build.gradle b/build.gradle
index 79b050c..64d28bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,10 +15,10 @@
  */
 
 plugins {
-    id 'com.android.application' version '8.10.1' apply false
-    id 'com.android.library' version '8.10.1' apply false
+    id 'com.android.application' version '8.11.1' apply false
+    id 'com.android.library' version '8.11.1' apply false
     id 'org.jetbrains.kotlin.android' version "2.0.21" apply false
     id 'com.google.devtools.ksp' version '1.9.21-1.0.16' apply false
     id 'androidx.navigation.safeargs' version '2.6.0' apply false
-    id 'com.squareup.wire' version '4.4.3' apply false
+    id 'com.squareup.wire' version '5.3.5' apply false
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c6c1c0c..ef2cb52 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
-distributionSha256Sum=89d4e70e4e84e2d2dfbb63e4daa53e21b25017cc70c37e4eea31ee51fb15098a
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
\ No newline at end of file

From 4498aa191f310ecf5c210386bbff98c18dfd40a9 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 21 Jul 2025 02:00:00 +0200
Subject: [PATCH 20/23] Update Google Play Billing Library

---
 app/build.gradle                                    |  2 +-
 .../android/ui/payment/ActivityPurchaseModel.kt     | 13 +++++++++----
 .../java/com/android/billingclient/api/Mocks.kt     | 13 +++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d4597b0..02fb07f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -218,7 +218,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp-tls:4.9.3'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
 
-    googleApiImplementation "com.android.billingclient:billing-ktx:7.1.1"
+    googleApiImplementation "com.android.billingclient:billing-ktx:8.0.0"
 
     implementation('io.socket:socket.io-client:2.0.0') {
         exclude group: 'org.json', module: 'json'
diff --git a/app/src/main/java/io/timelimit/android/ui/payment/ActivityPurchaseModel.kt b/app/src/main/java/io/timelimit/android/ui/payment/ActivityPurchaseModel.kt
index 001cf94..ec3bc27 100644
--- a/app/src/main/java/io/timelimit/android/ui/payment/ActivityPurchaseModel.kt
+++ b/app/src/main/java/io/timelimit/android/ui/payment/ActivityPurchaseModel.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2023 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,9 +74,14 @@ class ActivityPurchaseModel(application: Application): AndroidViewModel(applicat
         clientMutex.withLock {
             if (_billingClient == null) {
                 _billingClient = BillingClient.newBuilder(getApplication())
-                        .enablePendingPurchases()
-                        .setListener(purchaseUpdatedListener)
-                        .build()
+                    .enablePendingPurchases(
+                        PendingPurchasesParams
+                            .newBuilder()
+                            .enableOneTimeProducts()
+                            .build()
+                    )
+                    .setListener(purchaseUpdatedListener)
+                    .build()
             }
 
             val initBillingClient = _billingClient!!
diff --git a/app/src/noGoogleApi/java/com/android/billingclient/api/Mocks.kt b/app/src/noGoogleApi/java/com/android/billingclient/api/Mocks.kt
index 660edaa..7cc9759 100644
--- a/app/src/noGoogleApi/java/com/android/billingclient/api/Mocks.kt
+++ b/app/src/noGoogleApi/java/com/android/billingclient/api/Mocks.kt
@@ -1,5 +1,5 @@
 /*
- * TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
+ * TimeLimit Copyright <C> 2019 - 2025 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ object BillingClient {
     enum class ProductType { INAPP }
 
     object Builder {
-        fun enablePendingPurchases() = this
+        fun enablePendingPurchases(params: PendingPurchasesParams) = this
         fun setListener(listener: PurchasesUpdatedListener) = this
         fun build() = BillingClient
     }
@@ -143,4 +143,13 @@ object QueryPurchasesParams {
     fun newBuilder() = this
     fun setProductType(type: BillingClient.ProductType) = this
     fun build() = this
+}
+
+object PendingPurchasesParams {
+    object Builder {
+        fun enableOneTimeProducts() = this
+        fun build() = PendingPurchasesParams
+    }
+
+    fun newBuilder() = Builder
 }
\ No newline at end of file

From 0505fa0f8b039d30cd7c12fe72b8cd6211dfa166 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 21 Jul 2025 02:00:00 +0200
Subject: [PATCH 21/23] Extend .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 3e14967..472c576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /captures
 .externalNativeBuild
 .idea
+.kotlin

From c746770e89efadf42412ad8d50dbba11540802a4 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 21 Jul 2025 02:00:00 +0200
Subject: [PATCH 22/23] Increase target sdk to 36

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 02fb07f..594e7a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,11 +26,11 @@ plugins {
 
 android {
     namespace 'io.timelimit.android'
-    compileSdk 35
+    compileSdk 36
     defaultConfig {
         applicationId "io.timelimit.android"
         minSdkVersion 26
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode 223
         versionName "7.2.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

From 6c02c4e4c7f59a92a7a734828eb8575378ce297f Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 21 Jul 2025 02:00:00 +0200
Subject: [PATCH 23/23] Release 7.3.0

---
 app/build.gradle                 | 4 ++--
 app/src/main/play/de-DE/whatsnew | 2 +-
 app/src/main/play/en-US/whatsnew | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 594e7a1..2dcb3a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         applicationId "io.timelimit.android"
         minSdkVersion 26
         targetSdkVersion 36
-        versionCode 223
-        versionName "7.2.4"
+        versionCode 224
+        versionName "7.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         kapt {
             arguments {
diff --git a/app/src/main/play/de-DE/whatsnew b/app/src/main/play/de-DE/whatsnew
index bc76ab2..eb689fd 100644
--- a/app/src/main/play/de-DE/whatsnew
+++ b/app/src/main/play/de-DE/whatsnew
@@ -1,2 +1,2 @@
-- Abstürze in bestimmten Fällen behoben
+- Funktionsumfang bei Verwendung der Geräte-Besitzer-Berechtigung erweitert
 - enthaltene Komponenten aktualisiert
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 74e5016..8e96ea5 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1,2 +1,2 @@
-- fix crashes in specific scenarios
+- add more features for users of the device owner permission
 - update contained software