Skip to content

Refine usage fallback logic with 1-day threshold #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alv-cor wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refine usage fallback logic with 1-day threshold #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions Reef/src/main/java/dev/pranav/reef/util/ScreenUsageHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,27 @@ object ScreenUsageHelper {
end: Long,
targetPackage: String? = null
): Map<String, Long> {
fun Map<*, Long>.totalTime(): Long = values.sum()
val ONE_DAY_MS: Long = 24 * 60 * 60 * 1000L

try {
val eventBasedUsage =
var usage =
calculateUsageFromEvents(usageStatsManager, start, end, targetPackage)

if (eventBasedUsage.isEmpty()) {
Log.w(TAG, "Event-based tracking returned no data, using UsageStats fallback")
return calculateUsageFromStats(usageStatsManager, start, end, targetPackage)
if (!usage.isEmpty() && usage.totalTime() <= ONE_DAY_MS) {
return usage
}

usage = calculateUsageFromStats(usageStatsManager, start, end, targetPackage)

if (usage.totalTime() <= ONE_DAY_MS) {
return usage
}

return eventBasedUsage
return emptyMap()
} catch (e: Exception) {
Log.e(TAG, "Error fetching usage", e)
return calculateUsageFromStats(usageStatsManager, start, end, targetPackage)
return emptyMap()
}
}

Expand Down