nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Sets and Maps are 5x more memory intensive than Lists. This should help with memory management.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-08-02 16:33:53 -04:00
parent 9ae31a3429
commit 09b1451dc1
1 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
+37 -30
View File
@@ -51,20 +51,20 @@ open class Note(val idHex: String) {
var replyTo: List<Note>? = null var replyTo: List<Note>? = null
// These fields are updated every time an event related to this note is received. // These fields are updated every time an event related to this note is received.
var replies = setOf<Note>() var replies = listOf<Note>()
private set private set
var reactions = mapOf<String, Set<Note>>() var reactions = mapOf<String, List<Note>>()
private set private set
var boosts = setOf<Note>() var boosts = listOf<Note>()
private set private set
var reports = mapOf<User, Set<Note>>() var reports = mapOf<User, List<Note>>()
private set private set
var zaps = mapOf<Note, Note?>() var zaps = mapOf<Note, Note?>()
private set private set
var zapPayments = mapOf<Note, Note?>() var zapPayments = mapOf<Note, Note?>()
private set private set
var relays = setOf<String>() var relays = listOf<String>()
private set private set
var lastReactionsDownloadTime: Map<String, EOSETime> = emptyMap() var lastReactionsDownloadTime: Map<String, EOSETime> = emptyMap()
@@ -151,15 +151,20 @@ open class Note(val idHex: String) {
} }
fun removeReply(note: Note) { fun removeReply(note: Note) {
replies = replies - note if (note in replies) {
liveSet?.replies?.invalidateData() replies = replies - note
} liveSet?.replies?.invalidateData()
fun removeBoost(note: Note) { }
boosts = boosts - note
liveSet?.boosts?.invalidateData()
} }
fun removeAllChildNotes(): Set<Note> { fun removeBoost(note: Note) {
if (note in boosts) {
boosts = boosts - note
liveSet?.boosts?.invalidateData()
}
}
fun removeAllChildNotes(): List<Note> {
val toBeRemoved = replies + val toBeRemoved = replies +
reactions.values.flatten() + reactions.values.flatten() +
boosts + boosts +
@@ -169,13 +174,13 @@ open class Note(val idHex: String) {
zapPayments.keys + zapPayments.keys +
zapPayments.values.filterNotNull() zapPayments.values.filterNotNull()
replies = setOf<Note>() replies = listOf<Note>()
reactions = mapOf<String, Set<Note>>() reactions = mapOf<String, List<Note>>()
boosts = setOf<Note>() boosts = listOf<Note>()
reports = mapOf<User, Set<Note>>() reports = mapOf<User, List<Note>>()
zaps = mapOf<Note, Note?>() zaps = mapOf<Note, Note?>()
zapPayments = mapOf<Note, Note?>() zapPayments = mapOf<Note, Note?>()
relays = setOf<String>() relays = listOf<String>()
lastReactionsDownloadTime = emptyMap() lastReactionsDownloadTime = emptyMap()
liveSet?.replies?.invalidateData() liveSet?.replies?.invalidateData()
@@ -193,14 +198,16 @@ open class Note(val idHex: String) {
if (reaction in reactions.keys && reactions[reaction]?.contains(note) == true) { if (reaction in reactions.keys && reactions[reaction]?.contains(note) == true) {
reactions[reaction]?.let { reactions[reaction]?.let {
val newList = it.minus(note) if (note in it) {
if (newList.isEmpty()) { val newList = it.minus(note)
reactions = reactions.minus(reaction) if (newList.isEmpty()) {
} else { reactions = reactions.minus(reaction)
reactions = reactions + Pair(reaction, newList) } else {
} reactions = reactions + Pair(reaction, newList)
}
liveSet?.reactions?.invalidateData() liveSet?.reactions?.invalidateData()
}
} }
} }
} }
@@ -306,7 +313,7 @@ open class Note(val idHex: String) {
val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+" val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
if (reaction !in reactions.keys) { if (reaction !in reactions.keys) {
reactions = reactions + Pair(reaction, setOf(note)) reactions = reactions + Pair(reaction, listOf(note))
liveSet?.reactions?.invalidateData() liveSet?.reactions?.invalidateData()
} else if (reactions[reaction]?.contains(note) == false) { } else if (reactions[reaction]?.contains(note) == false) {
reactions = reactions + Pair(reaction, (reactions[reaction] ?: emptySet()) + note) reactions = reactions + Pair(reaction, (reactions[reaction] ?: emptySet()) + note)
@@ -318,7 +325,7 @@ open class Note(val idHex: String) {
val author = note.author ?: return val author = note.author ?: return
if (author !in reports.keys) { if (author !in reports.keys) {
reports = reports + Pair(author, setOf(note)) reports = reports + Pair(author, listOf(note))
liveSet?.reports?.invalidateData() liveSet?.reports?.invalidateData()
} else if (reports[author]?.contains(note) == false) { } else if (reports[author]?.contains(note) == false) {
reports = reports + Pair(author, (reports[author] ?: emptySet()) + note) reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
@@ -411,8 +418,8 @@ open class Note(val idHex: String) {
return boosts.any { it.author?.pubkeyHex == user.pubkeyHex } return boosts.any { it.author?.pubkeyHex == user.pubkeyHex }
} }
fun reportsBy(user: User): Set<Note> { fun hasReportsBy(user: User): Boolean {
return reports[user] ?: emptySet() return reports[user]?.isNotEmpty() ?: false
} }
fun reportAuthorsBy(users: Set<HexKey>): List<User> { fun reportAuthorsBy(users: Set<HexKey>): List<User> {
@@ -576,9 +583,9 @@ open class Note(val idHex: String) {
} }
replyTo = null replyTo = null
replies = emptySet() replies = emptyList()
reactions = emptyMap() reactions = emptyMap()
boosts = emptySet() boosts = emptyList()
reports = emptyMap() reports = emptyMap()
zaps = emptyMap() zaps = emptyMap()
} }