bitmessage/Abit
bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some fixes around deleting/trashing messages

Browse Source
This commit is contained in:
Christian Basler 2017-09-15 15:25:32 +02:00
parent 1e8b71e43b
commit f4b6bcb8d9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/ch/dissem/apps/abit/MessageDetailFragment.kt
View File

@ -166,10 +166,11 @@ class MessageDetailFragment : Fragment() {
return true return true
} }
R.id.delete -> { R.id.delete -> {
Singleton.labeler.delete(item)
if (isInTrash(item)) { if (isInTrash(item)) {
Singleton.labeler.delete(item)
messageRepo.remove(item) messageRepo.remove(item)
} else { } else {
Singleton.labeler.delete(item)
messageRepo.save(item) messageRepo.save(item)
} }
activity.onBackPressed() activity.onBackPressed()

10
app/src/main/java/ch/dissem/apps/abit/MessageListFragment.kt
View File

@ -241,12 +241,16 @@ class MessageListFragment : Fragment(), ListHolder<Label> {
this.swipeableMessageAdapter = adapter this.swipeableMessageAdapter = adapter
Singleton.labeler.listener = { message, added, removed -> Singleton.labeler.listener = { message, added, removed ->
if (added.contains(currentLabel)) { if (currentLabel?.type == Label.Type.TRASH && added.all { it.type == Label.Type.TRASH } && removed.isEmpty()) {
// TODO: add to current list, at correct position // work-around for messages that are deleted from trash
swipeableMessageAdapter?.remove(message)
} else if (added.contains(currentLabel)) {
// in most cases, top should be the correct position, but time will show if
// the message should be properly sorted in
swipeableMessageAdapter?.addFirst(message)
} else if (removed.contains(currentLabel)) { } else if (removed.contains(currentLabel)) {
swipeableMessageAdapter?.remove(message) swipeableMessageAdapter?.remove(message)
} else if (removed.any { it.type == Label.Type.UNREAD } || added.any { it.type == Label.Type.UNREAD }) { } else if (removed.any { it.type == Label.Type.UNREAD } || added.any { it.type == Label.Type.UNREAD }) {
// TODO: update if in current list, maybe update unread badges
swipeableMessageAdapter?.update(message) swipeableMessageAdapter?.update(message)
} }
} }