Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,22 @@ class WhatSaveViewModel(
emit(SaveResult(isSaving = true))
val result = repository.saveStatus(status, saveName)
emit(SaveResult.single(result))
// After saving, we must manually refresh the "Saved" list
// so the user sees the new, correct data when they switch tabs.
if (result != null) {
loadSavedStatuses() //calls refresh function in the bg
}
}

fun saveStatuses(statuses: List<Status>): LiveData<SaveResult> = liveData(IO) {
emit(SaveResult(isSaving = true))
val savedStatuses = repository.saveStatuses(statuses)
val savedUris = savedStatuses.map { it.fileUri }
emit(SaveResult(statuses = savedStatuses, uris = savedUris, saved = savedStatuses.size))
// Also refresh the "Saved" list here for consistency -- previously it worked by luck ig!
if (savedStatuses.isNotEmpty()) {
loadSavedStatuses()
}
}

fun deleteStatus(status: Status): LiveData<DeletionResult> = liveData(IO) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ class SavedStatusesFragment : StatusesFragment() {
}
}

//Everytime the 'Saved' tab becomes visible -> Force reload
//So we beat the race condition that causing Unix time epoch
override fun onResume() {
super.onResume()
onRefresh()
}

override fun createAdapter(): StatusAdapter =
StatusAdapter(
requireActivity(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,11 @@ class StatusesRepositoryImpl(
}

override suspend fun save(status: Status, saveName: String?): SavedStatus? {
val savable = status.toStatusEntity(saveName)

//Timestamp issue fix!!
val currentTimeMillis = System.currentTimeMillis()
val savable = status.toStatusEntity(saveName, currentTimeMillis)

val result = createSavedStatus(savable, true)?.also { status ->
scanSavedStatus(listOf(status))
}
Expand Down
Loading