Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ android {
applicationId = "com.sameerasw.essentials"
minSdk = 26
targetSdk = 37
versionCode = 47
versionName = "15.3"
versionCode = 48
versionName = "15.4"

val whatsNewCounter = 2
buildConfigField("int", "WHATS_NEW_COUNTER", whatsNewCounter.toString())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class AppFlowHandler(
private var lastLockRequestTime: Long = 0
var currentPackage: String? = null
private set
private var currentUsageStatsPackage: String? = null

// App Automation State
private val activeAppAutomationIds = mutableSetOf<String>()
Expand All @@ -96,25 +97,28 @@ class AppFlowHandler(
val prefs = context.getSharedPreferences("essentials_prefs", Context.MODE_PRIVATE)
val useUsageAccess = prefs.getBoolean("use_usage_access", false)

val oldPackage = currentPackage
currentPackage = packageName

if (oldPackage != null && oldPackage != packageName) {
lastLeaveTimes[oldPackage] = System.currentTimeMillis()
}

if (packageName != context.packageName && packageName != lockingPackage) {
lockingPackage = null
if (isFromUsageStats) {
val oldUsagePackage = currentUsageStatsPackage
currentUsageStatsPackage = packageName
if (oldUsagePackage != null && oldUsagePackage != packageName) {
checkShutUpRestore(oldUsagePackage, packageName)
}
}

val oldPackage = currentPackage
if (isFromUsageStats == useUsageAccess) {
currentPackage = packageName
if (oldPackage != null && oldPackage != packageName) {
lastLeaveTimes[oldPackage] = System.currentTimeMillis()
}
if (packageName != context.packageName && packageName != lockingPackage) {
lockingPackage = null
}
checkAppLock(packageName)
checkHighlightNightLight(packageName)
checkAppAutomations(packageName)
checkGestureBarAutomation(packageName)
checkShutUpRestore(oldPackage, packageName)
}

}

fun onAuthenticated(packageName: String) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ object ServiceUtils {
val hasShutUpApps = shutUpConfigs.any { it.isEnabled }

val shouldRun =
isUseUsageAccess && (isAppLockEnabled || isDynamicNightLightEnabled || isHideGestureBarOnLauncherEnabled || hasAppAutomations || hasShutUpApps)
(isUseUsageAccess && (isAppLockEnabled || isDynamicNightLightEnabled || isHideGestureBarOnLauncherEnabled || hasAppAutomations)) || hasShutUpApps

val intent = Intent(context, AppDetectionService::class.java)
if (shouldRun) {
Expand Down