Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 16:19:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add manufacturer to notification help.

Browse Source
This commit is contained in:
Michelle Tang
2024-08-08 15:16:45 -04:00
committed by mtang-signal
parent 7807d92825
commit 21019d1726
2 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/org/thoughtcrime/securesms/notifications/DeviceSpecificNotificationConfig.kt
View File

@@ -29,6 +29,7 @@ object DeviceSpecificNotificationConfig {
*/
data class Config(
@JsonProperty val model: String = "",
@JsonProperty val manufacturer: String = "",
@JsonProperty val showConditionCode: String = ShowCondition.NONE.code,
@JsonProperty val link: String = GENERAL_SUPPORT_URL,
@JsonProperty val localePercent: String = "*",
@@ -66,16 +67,27 @@ object DeviceSpecificNotificationConfig {
emptyList()
}
val config: Config? = list
.filter { it.model.isNotEmpty() }
.find {
if (it.model.last() == '*') {
Build.MODEL.startsWith(it.model.substring(0, it.model.length - 1))
} else {
it.model.contains(Build.MODEL)
}
}
val matchedConfigs: List<Config> = list
.filter { matchesModel(it.model) || matchesManufacturer(it.manufacturer) }
return config ?: default
val matchedModelConfig: Config? = matchedConfigs.firstOrNull { matchesModel(it.model) }
if (matchedModelConfig != null) {
return matchedModelConfig
}
return matchedConfigs.firstOrNull() ?: default
}
private fun matchesModel(model: String): Boolean {
return if (model.isNotEmpty() && model.last() == '*') {
Build.MODEL.startsWith(model.substring(0, model.length - 1))
} else {
model.equals(Build.MODEL, ignoreCase = true)
}
}
private fun matchesManufacturer(manufacturer: String): Boolean {
return manufacturer.equals(Build.MANUFACTURER, ignoreCase = true)
}
}