gergely/matrix-glib-sdk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch up Matrix.Event.State

Browse Source 
* Use private members
* Make state_key mandatory
This commit is contained in:
Gergely Polonkai 2016-03-09 14:55:41 +01:00 committed by Gergely Polonkai
parent a668dc7b98
commit ddf3fccbaa
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/matrix-event-state-base.vala
View File

@ -40,7 +40,9 @@ public abstract class Matrix.Event.State : Matrix.Event.Base {
Json.Node? node; Json.Node? node;
if ((node = root.get_member("state_key")) != null) { if ((node = root.get_member("state_key")) != null) {
state_key = node.get_string(); _state_key = node.get_string();
} else if (Config.DEBUG) {
warning("state_key is not present in a State event");
} }
if ((node = root.get_member("prev_content")) != null) { if ((node = root.get_member("prev_content")) != null) {
@ -54,13 +56,16 @@ public abstract class Matrix.Event.State : Matrix.Event.Base {
to_json(Json.Node json_node) to_json(Json.Node json_node)
throws Matrix.Error throws Matrix.Error
{ {
var root = json_node.get_object(); if (_state_key == null) {
throw new Matrix.Error.INCOMPLETE(
if (state_key != null) { "Won't generate state events without state_key");
root.set_string_member("state_key", state_key);
} }
if (prev_content != null) { var root = json_node.get_object();
root.set_string_member("state_key", state_key);
if (_prev_content != null) {
root.set_member("prev_content", prev_content); root.set_member("prev_content", prev_content);
} }