Merge 8bb015877b75044071671ab6434433b55fb316c2 into 4d20b11f256c40e3894c229ed638d7ea04ebdc44

Merge branch 'main' into chore/backup-wakelock
2025-08-05 08:41:42 -04:00 · 2024-10-01 14:42:32 -04:00 · 2024-09-24 09:11:24 +02:00 · 2024-09-17 23:21:40 +02:00 · 2024-09-09 13:07:41 +03:00 · 2024-09-08 17:42:56 +03:00
1 changed files with 4 additions and 2 deletions
--- a/mobile/lib/pages/backup/backup_controller.page.dart
+++ b/mobile/lib/pages/backup/backup_controller.page.dart
@ -98,7 +98,8 @@ class BackupControllerPage extends HookConsumerWidget {
    useEffect(
      () {
-        if (backupState.backupProgress == BackUpProgressEnum.inProgress) {
+        if (backupState.backupProgress == BackUpProgressEnum.inProgress ||
            backupState.backupProgress == BackUpProgressEnum.manualInProgress) {
          startScreenDarkenTimer();
          WakelockPlus.enable();
        } else {
@ -302,7 +303,8 @@ class BackupControllerPage extends HookConsumerWidget {
        if (isScreenDarkened.value) {
          stopScreenDarkenTimer();
        }
-        if (backupState.backupProgress == BackUpProgressEnum.inProgress) {
+        if (backupState.backupProgress == BackUpProgressEnum.inProgress ||
            backupState.backupProgress == BackUpProgressEnum.manualInProgress) {
          startScreenDarkenTimer();
        }
      },
Author	SHA1	Message	Date
Saschl	205f36b8ab	Merge 8bb015877b75044071671ab6434433b55fb316c2 into 4d20b11f256c40e3894c229ed638d7ea04ebdc44	2024-10-01 14:42:32 -04:00
Saschl	8bb015877b	Merge branch 'main' into chore/backup-wakelock	2024-09-24 09:11:24 +02:00
Saschl	59a0747ffb	Merge branch 'main' into chore/backup-wakelock	2024-09-17 23:21:40 +02:00
Saschl	cef617d18d	Merge branch 'main' into chore/backup-wakelock	2024-09-09 13:07:41 +03:00
Saschl	1b4990f98a	Merge branch 'main' into chore/backup-wakelock	2024-09-08 17:42:56 +03:00
Saschl	cabc5edd6a	Merge branch 'main' into chore/backup-wakelock	2024-09-06 22:58:01 +03:00
Saschl	2ff86e548f	Merge branch 'main' into chore/backup-wakelock	2024-08-22 08:37:31 +02:00
Saschl	0887ff3c2b	Merge branch 'main' into chore/backup-wakelock	2024-08-21 21:23:27 +02:00
Saschl	d2ebcd6248	Merge branch 'main' into chore/backup-wakelock	2024-08-20 23:17:26 +02:00
Saschl	e69eab18b2	Merge branch 'main' into chore/backup-wakelock	2024-08-20 15:20:56 +02:00
Saschl	1a86d847cc	Merge branch 'main' into chore/backup-wakelock	2024-08-20 09:28:45 +02:00
Saschl	b56223cde3	Merge branch 'main' into chore/backup-wakelock	2024-08-19 22:51:39 +02:00
Sascha Rudolf	deb6d49184	fix: consider manual upload when darkening screen	2024-08-19 22:47:59 +02:00