Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 07:09:56 +01:00
Code Issues Projects Releases Wiki Activity

Allow null values in JsonDict.

Browse Source
This commit is contained in:
akwizgran
2018-10-03 13:28:53 +01:00
committed by Torsten Grote
parent 609c90f57e
commit b4b0d3daa6
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-headless/src/main/java/org/briarproject/briar/headless/blogs/OutputBlogPost.kt
View File

@@ -1,25 +1,21 @@
package org.briarproject.briar.headless.blogs package org.briarproject.briar.headless.blogs
import org.briarproject.bramble.api.sync.MessageId
import org.briarproject.bramble.identity.output import org.briarproject.bramble.identity.output
import org.briarproject.briar.api.blog.BlogPostHeader import org.briarproject.briar.api.blog.BlogPostHeader
import org.briarproject.briar.api.blog.MessageType import org.briarproject.briar.api.blog.MessageType
import org.briarproject.briar.headless.json.JsonDict import org.briarproject.briar.headless.json.JsonDict
internal fun BlogPostHeader.output(body: String): JsonDict { internal fun BlogPostHeader.output(body: String) = JsonDict(
val dict = JsonDict(
"body" to body, "body" to body,
"author" to author.output(), "author" to author.output(),
"authorStatus" to authorStatus.output(), "authorStatus" to authorStatus.output(),
"type" to type.output(), "type" to type.output(),
"id" to id.bytes, "id" to id.bytes,
"parentId" to parentId?.bytes,
"read" to isRead, "read" to isRead,
"rssFeed" to isRssFeed, "rssFeed" to isRssFeed,
"timestamp" to timestamp, "timestamp" to timestamp,
"timestampReceived" to timeReceived "timestampReceived" to timeReceived
) )
if (parentId != null) dict["parentId"] = (parentId as MessageId).bytes
return dict
}
internal fun MessageType.output() = name.toLowerCase() internal fun MessageType.output() = name.toLowerCase()

4
briar-headless/src/main/java/org/briarproject/briar/headless/json/JsonDict.kt
View File

@@ -1,11 +1,11 @@
package org.briarproject.briar.headless.json package org.briarproject.briar.headless.json
class JsonDict(vararg pairs: Pair<String, Any>) : HashMap<String, Any>(pairs.size) { class JsonDict(vararg pairs: Pair<String, Any?>) : HashMap<String, Any?>(pairs.size) {
init { init {
putAll(pairs) putAll(pairs)
} }
fun putAll(vararg pairs: Pair<String, Any>) { fun putAll(vararg pairs: Pair<String, Any?>) {
for (p in pairs) put(p.first, p.second) for (p in pairs) put(p.first, p.second)
} }
} }