Skip to content

fix: ensure index files exist before hashing when backing and handle … #120

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
merged 1 commit into from
Oct 27, 2025
Merged

fix: ensure index files exist before hashing when backing and handle … #120

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
10 changes: 5 additions & 5 deletions app/src/main/java/com/fpf/smartscan/ui/screens/settings/SettingsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@ class SettingsViewModel(private val application: Application) : AndroidViewModel
val imageIndexFile = File(application.filesDir, ImageIndexer.INDEX_FILENAME)
val videoIndexFile = File(application.filesDir, VideoIndexer.INDEX_FILENAME)
val hashFile = File(application.cacheDir, HASH_FILENAME)
val filesToZip = listOf(imageIndexFile, videoIndexFile, hashFile)
_isBackupLoading.value = true

viewModelScope.launch(Dispatchers.IO){
try {
val imageHash = hashFile(imageIndexFile)
val videoHash = hashFile(videoIndexFile)
hashFile.writeText("$imageHash\n$videoHash")
val hashes: List<String> = listOf(imageIndexFile, videoIndexFile).filter { it.exists() }.map{hashFile(it)}
hashFile.writeText(hashes.joinToString("\n") )

zipFiles(indexZipFile, listOf(imageIndexFile, videoIndexFile, hashFile))
zipFiles(indexZipFile, filesToZip)
copyToUri(application, uri, indexZipFile)
_event.emit("Backup successful")
}catch (e: Exception){
Expand Down Expand Up @@ -193,7 +193,7 @@ class SettingsViewModel(private val application: Application) : AndroidViewModel
private suspend fun isValidBackupFile(extractedFiles: List<File>): Boolean{
val hashFile = extractedFiles.find { it.name == HASH_FILENAME }?: return false
val hashesFromFile: List<String> = hashFile.readLines()
if(hashesFromFile.size < 2) return false
if(hashesFromFile.isEmpty()) return false // must have hash for at least 1 of image or video index file

val indexFiles = extractedFiles.filterNot{it.name == HASH_FILENAME}
val indexHashes = indexFiles.map{hashFile(it)}
Expand Down