Skip to content

Commit

Permalink
Fixed search crash (#194)
Browse files Browse the repository at this point in the history 
* fixed crash on search result screen when new folder created

* fixed back button navigation
  • Loading branch information
@aman-alfresco
aman-alfresco committed Oct 20, 2022
1 parent 85d606d commit e5ccdfa
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 145 deletions.
2 changes: 1 addition & 1 deletion actions/src/main/kotlin/com/alfresco/content/actions/ActionUploadFiles.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ data class ActionUploadFiles(
context,
it,
if (entry.isProcessService) entry.parentId ?: "" else entry.id,
entry.isProcessService
isProcessService = entry.isProcessService
)
}
repository.setTotalTransferSize(result.size)
Expand Down
2 changes: 1 addition & 1 deletion actions/src/main/kotlin/com/alfresco/content/actions/ActionUploadMedia.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ data class ActionUploadMedia(
context,
it,
if (entry.isProcessService) entry.parentId ?: "" else entry.id,
entry.isProcessService
isProcessService = entry.isProcessService
)
}
repository.setTotalTransferSize(result.size)
Expand Down
2 changes: 1 addition & 1 deletion browse/src/main/kotlin/com/alfresco/content/browse/BrowseFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ class BrowseFragment : ListFragment<BrowseViewModel, BrowseViewState>() {
}

override fun onEntryCreated(entry: ParentEntry) {
if (isAdded)
if (isAdded && isVisible)
onItemClicked(entry as Entry)
}
}
202 changes: 61 additions & 141 deletions data/src/main/kotlin/com/alfresco/content/data/OfflineRepository.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ class OfflineRepository(val session: Session = SessionManager.requireSession) {
fun init(context: Context) {
synchronized(this) {
if (!this::boxStore.isInitialized) {
boxStore = MyObjectBox.builder()
.androidContext(context)
.build()
boxStore = MyObjectBox.builder().androidContext(context).build()
}
}
}
Expand All @@ -39,23 +37,15 @@ class OfflineRepository(val session: Session = SessionManager.requireSession) {
box = ObjectBox.boxStore.boxFor()
}

fun entry(id: String): Entry? =
box.query()
.equal(Entry_.id, id, StringOrder.CASE_SENSITIVE)
.build()
.findFirst()
fun entry(id: String): Entry? = box.query().equal(Entry_.id, id, StringOrder.CASE_SENSITIVE).build().findFirst()

fun markForSync(entry: Entry) =
update(entry.copy(isOffline = true, offlineStatus = OfflineStatus.PENDING))
fun markForSync(entry: Entry) = update(entry.copy(isOffline = true, offlineStatus = OfflineStatus.PENDING))

fun removeFromSync(entry: Entry) =
update(entry.copy(isOffline = false))
fun removeFromSync(entry: Entry) = update(entry.copy(isOffline = false))

fun remove(entry: Entry) =
box.remove(entry)
fun remove(entry: Entry) = box.remove(entry)

fun update(entry: Entry) =
entry.also { box.put(it) }
fun update(entry: Entry) = entry.also { box.put(it) }

/**
* updating the total transfer count
Expand All @@ -76,77 +66,48 @@ class OfflineRepository(val session: Session = SessionManager.requireSession) {
* returns the transfer size count
*/
fun getTotalTransfersSize(): Int {
val list = box.query()
.equal(Entry_.isTotalEntry, true)
.equal(Entry_.isProcessService, false)
.build()
.find()
val list = box.query().equal(Entry_.isTotalEntry, true).equal(Entry_.isProcessService, false).build().find()
return if (list.isEmpty()) 0 else list[0].totalCount
}

fun offlineEntries(parentId: String?): Flow<ResponsePaging> = callbackFlow {
val query = offlineEntriesQuery(parentId)
val subscription = query.subscribe()
.observer { data ->
val subscription = query.subscribe().observer { data ->
val count = data.count().toLong()
trySendBlocking(
ResponsePaging(
data,
Pagination(
count,
false,
0,
count,
count
data, Pagination(
count, false, 0, count, count
)
)
)
}
awaitClose { subscription.cancel() }
}

private fun offlineEntriesQuery(parentId: String?) =
box.query()
.apply {
if (parentId != null) {
equal(Entry_.parentId, parentId, StringOrder.CASE_SENSITIVE)
// Exclude uploads from synced folders
equal(Entry_.isUpload, false)
} else {
equal(Entry_.isOffline, true)
}
private fun offlineEntriesQuery(parentId: String?) = box.query().apply {
if (parentId != null) {
equal(Entry_.parentId, parentId, StringOrder.CASE_SENSITIVE)
// Exclude uploads from synced folders
equal(Entry_.isUpload, false)
} else {
equal(Entry_.isOffline, true)
}
.order(Entry_.name)
.build()

internal fun fetchTopLevelOfflineEntries() =
box.query()
.equal(Entry_.isOffline, true)
.build()
.find()

internal fun fetchAllOfflineEntries() =
box.query()
.notEqual(Entry_.offlineStatus, OfflineStatus.UNDEFINED.value(), StringOrder.CASE_SENSITIVE)
.equal(Entry_.isUpload, false)
.build()
.find()
}.order(Entry_.name).build()

internal fun fetchTopLevelOfflineEntries() = box.query().equal(Entry_.isOffline, true).build().find()

internal fun fetchAllOfflineEntries() = box.query().notEqual(Entry_.offlineStatus, OfflineStatus.UNDEFINED.value(), StringOrder.CASE_SENSITIVE).equal(Entry_.isUpload, false).build().find()

private fun fetchAllTransferEntries() =
box.query()
.notEqual(Entry_.offlineStatus, OfflineStatus.UNDEFINED.value(), StringOrder.CASE_SENSITIVE)
.equal(Entry_.isUpload, true)
.equal(Entry_.isProcessService, false)
.build()
.find()
box.query().notEqual(Entry_.offlineStatus, OfflineStatus.UNDEFINED.value(), StringOrder.CASE_SENSITIVE).equal(Entry_.isUpload, true).equal(Entry_.isProcessService, false).build().find()

internal fun fetchOfflineEntry(target: Entry) = entry(target.id)

/**
* returns the pending transfer list from database
*/
fun buildTransferList(): List<Entry> =
fetchAllTransferEntries()
fun buildTransferList(): List<Entry> = fetchAllTransferEntries()

/**
* update transfer size count using the parent ID
Expand All @@ -155,15 +116,15 @@ class OfflineRepository(val session: Session = SessionManager.requireSession) {
val count = getTotalTransfersSize()
val list = fetchAllTransferEntries()

if (list.isEmpty())
updateTransferSize(size)
if (list.isEmpty()) updateTransferSize(size)
else updateTransferSize(count + size)
}

fun scheduleContentForUpload(
context: Context,
contentUri: Uri,
parentId: String,
isExtension: Boolean = false,
isProcessService: Boolean = false
) {
val resolver = context.contentResolver
Expand All @@ -187,6 +148,7 @@ class OfflineRepository(val session: Session = SessionManager.requireSession) {
mimeType = mimeType,
isUpload = true,
offlineStatus = OfflineStatus.PENDING,
isExtension = isExtension,
isProcessService = isProcessService
)

Expand All @@ -207,8 +169,7 @@ class OfflineRepository(val session: Session = SessionManager.requireSession) {

private fun clearData() {
removeCompletedUploads()
if (buildTransferList().isEmpty())
updateTransferSize(0)
if (buildTransferList().isEmpty()) updateTransferSize(0)
}

fun scheduleForUpload(
Expand Down Expand Up @@ -239,95 +200,57 @@ class OfflineRepository(val session: Session = SessionManager.requireSession) {
File(srcPath).renameTo(dest)
}

internal fun fetchPendingUploads() =
box.query()
.equal(Entry_.isUpload, true)
.notEqual(Entry_.offlineStatus, OfflineStatus.SYNCED.value(), StringOrder.CASE_SENSITIVE)
.build()
.find()
internal fun fetchPendingUploads() = box.query().equal(Entry_.isUpload, true).notEqual(Entry_.offlineStatus, OfflineStatus.SYNCED.value(), StringOrder.CASE_SENSITIVE).build().find()

/**
* returns the list of uploads which is being uploaded on the server.
*/
fun observeUploads(parentId: String, isProcessService: Boolean = false): Flow<List<Entry>> =
callbackFlow {
val query = box.query()
.equal(Entry_.parentId, parentId, StringOrder.CASE_SENSITIVE)
.equal(Entry_.isUpload, true)
.equal(Entry_.isProcessService, isProcessService)
.order(Entry_.name)
.build()
val subscription = query.subscribe()
.observer {
trySendBlocking(it)
}
awaitClose { subscription.cancel() }
}
fun observeUploads(parentId: String, isProcessService: Boolean = false): Flow<List<Entry>> = callbackFlow {
val query = box.query().equal(Entry_.parentId, parentId, StringOrder.CASE_SENSITIVE).equal(Entry_.isUpload, true).equal(Entry_.isProcessService, isProcessService).order(Entry_.name).build()
val subscription = query.subscribe().observer {
trySendBlocking(it)
}
awaitClose { subscription.cancel() }
}

/**
* observer for transfer uploads
*/
fun observeTransferUploads(): Flow<List<Entry>> =
callbackFlow {
val query = box.query()
.equal(Entry_.isUpload, true)
.equal(Entry_.isProcessService, false)
.equal(Entry_.id, "", StringOrder.CASE_SENSITIVE)
.order(Entry_.name)
.build()
val subscription = query.subscribe()
.observer {
trySendBlocking(it)
}
awaitClose { subscription.cancel() }
}
fun observeTransferUploads(): Flow<List<Entry>> = callbackFlow {
val query = box.query().equal(Entry_.isUpload, true).equal(Entry_.isProcessService, false).equal(Entry_.id, "", StringOrder.CASE_SENSITIVE).order(Entry_.name).build()
val subscription = query.subscribe().observer {
trySendBlocking(it)
}
awaitClose { subscription.cancel() }
}

// Removes a completed upload with id
fun removeUpload(id: String) =
box.query()
.equal(Entry_.id, id, StringOrder.CASE_SENSITIVE)
.equal(Entry_.isUpload, true)
.build()
.remove()

fun removeCompletedUploads(parentId: String? = null) =
box.query()
.equal(Entry_.isUpload, true)
.equal(Entry_.offlineStatus, OfflineStatus.SYNCED.value(), StringOrder.CASE_SENSITIVE)
.apply {
if (parentId != null) {
equal(Entry_.parentId, parentId, StringOrder.CASE_SENSITIVE)
}
fun removeUpload(id: String) = box.query().equal(Entry_.id, id, StringOrder.CASE_SENSITIVE).equal(Entry_.isUpload, true).build().remove()

fun removeCompletedUploads(parentId: String? = null) = box.query().equal(Entry_.isUpload, true).equal(Entry_.offlineStatus, OfflineStatus.SYNCED.value(), StringOrder.CASE_SENSITIVE).apply {
if (parentId != null) {
equal(Entry_.parentId, parentId, StringOrder.CASE_SENSITIVE)
}
.build()
.remove()
}.build().remove()

/**
* remove the task entries on the basis of task ID from local db.
*/
fun removeTaskEntries(parentId: String? = null) =
box.query()
.equal(Entry_.isProcessService, true)
.apply {
if (parentId != null) {
equal(Entry_.parentId, parentId, StringOrder.CASE_SENSITIVE)
}
fun removeTaskEntries(parentId: String? = null) = box.query().equal(Entry_.isProcessService, true).apply {
if (parentId != null) {
equal(Entry_.parentId, parentId, StringOrder.CASE_SENSITIVE)
}
.build()
.remove()
}.build().remove()

fun contentUri(entry: Entry): String =
"file://${contentFile(entry).absolutePath}"
fun contentUri(entry: Entry): String = "file://${contentFile(entry).absolutePath}"

fun contentFile(entry: Entry): File =
if (entry.isUpload) {
File(session.uploadDir, entry.boxId.toString())
} else {
File(contentDir(entry), entry.name)
}
fun contentFile(entry: Entry): File = if (entry.isUpload) {
File(session.uploadDir, entry.boxId.toString())
} else {
File(contentDir(entry), entry.name)
}

fun contentDir(entry: Entry): File =
File(SessionManager.requireSession.filesDir, entry.id)
fun contentDir(entry: Entry): File = File(SessionManager.requireSession.filesDir, entry.id)

fun cleanup() {
SyncService.cancel(session.context)
Expand All @@ -341,9 +264,6 @@ class OfflineRepository(val session: Session = SessionManager.requireSession) {
}

private fun removeAllFiles() {
SessionManager
.requireSession
.filesDir
.deleteRecursively()
SessionManager.requireSession.filesDir.deleteRecursively()
}
}
2 changes: 1 addition & 1 deletion search/src/main/kotlin/com/alfresco/content/search/SearchResultsFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class SearchResultsFragment : ListFragment<SearchViewModel, SearchResultsState>(
}

override fun onEntryCreated(entry: ParentEntry) {
if (isAdded)
if (isAdded && isVisible)
onItemClicked(entry as Entry)
}

Expand Down

0 comments on commit e5ccdfa

Please sign in to comment.