From e83de74f6a4d447fc0c8ee42a1c860b0f861640c Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 14 Oct 2019 00:00:00 +0000
Subject: [PATCH] Remove old app suspending logic

---
 .../android/logic/BackgroundTaskLogic.kt        |  8 --------
 .../android/sync/ApplyServerDataStatus.kt       |  8 --------
 .../android/sync/actions/apply/ApplyAction.kt   | 17 -----------------
 .../timelimit/android/ui/lock/LockFragment.kt   |  2 --
 4 files changed, 35 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt b/app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt
index f8117c5..0a83b86 100644
--- a/app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt
+++ b/app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt
@@ -335,14 +335,6 @@ class BackgroundTaskLogic(val appLogic: AppLogic) {
                     if (category == null) {
                         usedTimeUpdateHelper?.commit(appLogic)
 
-                        if (
-                                AndroidIntegrationApps.ignoredApps[foregroundAppPackageName] == null &&
-                                AndroidIntegrationApps.appsToNotSuspend.contains(foregroundAppPackageName) == false
-                        ) {
-                            // don't suspend system apps which are whitelisted in any version
-                            appLogic.platformIntegration.setSuspendedApps(listOf(foregroundAppPackageName), true)
-                        }
-
                         openLockscreen(foregroundAppPackageName, foregroundAppActivityName)
                     } else if (category.temporarilyBlocked or (parentCategory?.temporarilyBlocked == true)) {
                         usedTimeUpdateHelper?.commit(appLogic)
diff --git a/app/src/main/java/io/timelimit/android/sync/ApplyServerDataStatus.kt b/app/src/main/java/io/timelimit/android/sync/ApplyServerDataStatus.kt
index 4683ddc..c64adfc 100644
--- a/app/src/main/java/io/timelimit/android/sync/ApplyServerDataStatus.kt
+++ b/app/src/main/java/io/timelimit/android/sync/ApplyServerDataStatus.kt
@@ -390,14 +390,6 @@ object ApplyServerDataStatus {
                             categoryId = item.categoryId,
                             assignedAppsVersion = item.version
                     )
-
-                    if (!database.config().isExperimentalFlagsSetSync(ExperimentalFlags.SYSTEM_LEVEL_BLOCKING)) {
-                        if (thisDeviceUserCategoryIds.contains(item.categoryId)) {
-                            runAsync {
-                                platformIntegration.setSuspendedApps(item.assignedApps, false)
-                            }
-                        }
-                    }
                 }
             }
 
diff --git a/app/src/main/java/io/timelimit/android/sync/actions/apply/ApplyAction.kt b/app/src/main/java/io/timelimit/android/sync/actions/apply/ApplyAction.kt
index 845e4fd..42e7ec5 100644
--- a/app/src/main/java/io/timelimit/android/sync/actions/apply/ApplyAction.kt
+++ b/app/src/main/java/io/timelimit/android/sync/actions/apply/ApplyAction.kt
@@ -22,7 +22,6 @@ import io.timelimit.android.async.Threads
 import io.timelimit.android.coroutines.executeAndWait
 import io.timelimit.android.crypto.Sha512
 import io.timelimit.android.data.Database
-import io.timelimit.android.data.model.ExperimentalFlags
 import io.timelimit.android.data.model.PendingSyncAction
 import io.timelimit.android.data.model.PendingSyncActionType
 import io.timelimit.android.data.model.UserType
@@ -164,22 +163,6 @@ object ApplyActionUtil {
 
                 LocalDatabaseParentActionDispatcher.dispatchParentActionSync(action, database)
 
-                // disable suspending the assigned app
-                if (!database.config().isExperimentalFlagsSetSync(ExperimentalFlags.SYSTEM_LEVEL_BLOCKING)) {
-                    if (action is AddCategoryAppsAction) {
-                        val thisDeviceId = database.config().getOwnDeviceIdSync()!!
-                        val thisDeviceEntry = database.device().getDeviceByIdSync(thisDeviceId)!!
-
-                        if (thisDeviceEntry.currentUserId != "") {
-                            val userCategories = database.category().getCategoriesByChildIdSync(thisDeviceEntry.currentUserId)
-
-                            if (userCategories.find { category -> category.id == action.categoryId } != null) {
-                                platformIntegration.setSuspendedApps(action.packageNames, false)
-                            }
-                        }
-                    }
-                }
-
                 if (action is SetDeviceUserAction) {
                     val thisDeviceId = database.config().getOwnDeviceIdSync()!!
 
diff --git a/app/src/main/java/io/timelimit/android/ui/lock/LockFragment.kt b/app/src/main/java/io/timelimit/android/ui/lock/LockFragment.kt
index aafd564..d98a888 100644
--- a/app/src/main/java/io/timelimit/android/ui/lock/LockFragment.kt
+++ b/app/src/main/java/io/timelimit/android/ui/lock/LockFragment.kt
@@ -324,8 +324,6 @@ class LockFragment : Fragment() {
                         val deviceId = deviceIdLive.waitForNullableValue()
 
                         if (deviceId != null) {
-                            logic.platformIntegration.setSuspendedApps(listOf(packageName), false)
-
                             Threads.database.executeAndWait(Runnable {
                                 try {
                                     database.temporarilyAllowedApp().addTemporarilyAllowedAppSync(TemporarilyAllowedApp(