PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable app data usage if all time usage is 0" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-02-28 12:10:43 +00:00
committed by Android (Google) Code Review
parent 3454f304a2 758e3828b3
commit bbedd98962
4 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
View File

@@ -81,16 +81,12 @@ class DataUsagePreferenceController(context: Context, key: String) :
}
private suspend fun update() {
val summary = withContext(Dispatchers.Default) {
val (summary, enabled) = withContext(Dispatchers.Default) {
networkTemplate = getNetworkTemplate()
getDataUsageSummary()
}
if (summary == null) {
preference.isEnabled = false
} else {
preference.isEnabled = true
preference.summary = summary
getDataUsageSummaryAndEnabled()
}
preference.isEnabled = enabled
preference.summary = summary
}
private fun getNetworkTemplate(): NetworkTemplate? = when {
@@ -105,17 +101,19 @@ class DataUsagePreferenceController(context: Context, key: String) :
fun createNetworkCycleDataRepository(): NetworkCycleDataRepository? =
networkTemplate?.let { NetworkCycleDataRepository(mContext, it) }
private fun getDataUsageSummary(): String? {
val repository = createNetworkCycleDataRepository() ?: return null
private fun getDataUsageSummaryAndEnabled(): Pair<String?, Boolean> {
val repository = createNetworkCycleDataRepository() ?: return null to false
repository.loadFirstCycle()?.let { usageData ->
return mContext.getString(
R.string.data_usage_template,
usageData.formatUsage(mContext),
usageData.formatDateRange(mContext),
)
) to (usageData.usage > 0 || repository.queryUsage(AllTimeRange).usage > 0)
}
return repository.queryUsage(AllTimeRange).takeIf { it.usage > 0 }
?.getDataUsedString(mContext)
val allTimeUsage = repository.queryUsage(AllTimeRange)
if (allTimeUsage.usage > 0) return allTimeUsage.getDataUsedString(mContext) to true
return null to false
}
}