Skip to content

fix: #303 again!!!! #313

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

Merged
sameerasw merged 1 commit into from
Mar 31, 2026
+85 −64
Merged

fix: #303 again!!!! #313

Show file tree
Hide file tree
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
137 changes: 74 additions & 63 deletions app/src/main/java/com/sameerasw/essentials/ui/activities/YourAndroidActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,81 +92,92 @@ class YourAndroidViewModel : ViewModel() {
}

viewModelScope.launch {
if (forceRefresh) {
_isRefreshing.value = true
} else {
_isSpecsLoading.value = true

// Try to load from cache first
val cached = withContext(Dispatchers.IO) {
com.sameerasw.essentials.utils.DeviceSpecsCache.getCachedSpecs(context)
}

if (cached != null) {
_deviceSpecs.value = cached
_isSpecsLoading.value = false
return@launch
try {
if (forceRefresh) {
_isRefreshing.value = true
} else {
_isSpecsLoading.value = true

// Try to load from cache first
val cached = withContext(Dispatchers.IO) {
com.sameerasw.essentials.utils.DeviceSpecsCache.getCachedSpecs(context)
}

if (cached != null) {
_deviceSpecs.value = cached
_isSpecsLoading.value = false
return@launch
}
}
}

val fetchedSpecs = withContext(Dispatchers.IO) {
val manufacturer = deviceInfo.manufacturer
val model = deviceInfo.model
val deviceName = deviceInfo.deviceName
val deviceCodename = deviceInfo.device
val fetchedSpecs = withContext(Dispatchers.IO) {
val manufacturer = deviceInfo.manufacturer
val model = deviceInfo.model
val deviceName = deviceInfo.deviceName
val deviceCodename = deviceInfo.device

// Generate a prioritized list of search queries
val queries = mutableListOf<String>()

// 1. Marketing name (Manufacturer + Model)
if (model.contains(manufacturer, ignoreCase = true)) {
queries.add(model)
} else {
queries.add("$manufacturer $model")
}
// Generate a prioritized list of search queries
val queries = mutableListOf<String>()
// 1. Marketing name (Manufacturer + Model)
if (model.contains(manufacturer, ignoreCase = true)) {
queries.add(model)
} else {
queries.add("$manufacturer $model")
}

// 2. User-defined device name (often it's the marketing name like "Galaxy S21 FE 5G")
if (deviceName.isNotBlank() && !queries.contains(deviceName)) {
queries.add(deviceName)
}
// 2. User-defined device name (often it's the marketing name like "Galaxy S21 FE 5G")
if (deviceName.isNotBlank() && !queries.contains(deviceName)) {
queries.add(deviceName)
}

// 3. Handle model numbers by stripping common prefixes (SM-, Redmi, Mi, POCO, etc.)
val prefixes = listOf("SM-", "Redmi ", "Mi ", "POCO ")
for (prefix in prefixes) {
if (model.startsWith(prefix, ignoreCase = true)) {
val stripped = model.substring(prefix.length).trim()
if (stripped.isNotBlank() && !queries.contains(stripped)) {
queries.add(stripped)
queries.add("$manufacturer $stripped")
// 3. Handle model numbers by stripping common prefixes (SM-, Redmi, Mi, POCO, etc.)
val prefixes = listOf("SM-", "Redmi ", "Mi ", "POCO ")
for (prefix in prefixes) {
if (model.startsWith(prefix, ignoreCase = true)) {
val stripped = model.substring(prefix.length).trim()
if (stripped.isNotBlank() && !queries.contains(stripped)) {
queries.add(stripped)
queries.add("$manufacturer $stripped")
}
}
}

// 4. Model number directly if it's different from marketing name
if (!queries.contains(model)) {
queries.add(model)
}

// 5. Device codename (e.g., "shiba", "a51", "r9q")
if (deviceCodename.isNotBlank() && !queries.contains(deviceCodename)) {
queries.add(deviceCodename)
}

com.sameerasw.essentials.utils.GSMArenaService.fetchSpecs(
preferredName = manufacturer,
preferredModel = model,
queries = queries.toTypedArray()
)
}

// 4. Model number directly if it's different from marketing name
if (!queries.contains(model)) {
queries.add(model)

if (fetchedSpecs != null) {
// Download and cache images
val specsWithImages = com.sameerasw.essentials.utils.DeviceSpecsCache.downloadImages(context, fetchedSpecs)
_deviceSpecs.value = specsWithImages
}

// 5. Device codename (e.g., "shiba", "a51", "r9q")
if (deviceCodename.isNotBlank() && !queries.contains(deviceCodename)) {
queries.add(deviceCodename)
_isSpecsLoading.value = false
_isRefreshing.value = false
} catch (e: Exception) {
// If anything goes wrong (corrupted cache, etc.), clear cache and force refresh once
com.sameerasw.essentials.utils.DeviceSpecsCache.clearCache(context)
if (!forceRefresh) {
loadDeviceSpecs(context, deviceInfo, forceRefresh = true)
} else {
_isSpecsLoading.value = false
_isRefreshing.value = false
}

com.sameerasw.essentials.utils.GSMArenaService.fetchSpecs(
preferredName = manufacturer,
preferredModel = model,
queries = queries.toTypedArray()
)
}

if (fetchedSpecs != null) {
// Download and cache images
val specsWithImages = com.sameerasw.essentials.utils.DeviceSpecsCache.downloadImages(context, fetchedSpecs)
_deviceSpecs.value = specsWithImages
}

_isSpecsLoading.value = false
_isRefreshing.value = false
}
}
}
Expand Down
12 changes: 11 additions & 1 deletion app/src/main/java/com/sameerasw/essentials/utils/DeviceSpecsCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,18 @@ object DeviceSpecsCache {
val file = File(context.filesDir, SPECS_FILE)
if (!file.exists()) return null
val json = file.readText()
gson.fromJson(json, DeviceSpecs::class.java)
val specs = gson.fromJson(json, DeviceSpecs::class.java)

// Validate essential data integrity or refetch
@Suppress("SENSELESS_COMPARISON")
if (specs == null || specs.detailSpec == null) {
clearCache(context)
null
} else {
specs
}
} catch (e: Exception) {
clearCache(context)
null
}
}
Expand Down