inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'store-fix-save-error-events' into 'master'

Browse source 
[Store] Fix storing of error events

See merge request famedly/famedlysdk!49
This commit is contained in:
Phillipp Kurtz 2019-07-25 08:42:12 +00:00
parent 036e50b1d1 4668566ec0
commit 9118311844
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/src/Store.dart
View file

@ -212,7 +212,7 @@ class Store {
/// Stores an EventUpdate object in the database. Must be called inside of /// Stores an EventUpdate object in the database. Must be called inside of
/// [transaction]. /// [transaction].
Future<void> storeEventUpdate(EventUpdate eventUpdate) { Future<void> storeEventUpdate(EventUpdate eventUpdate) {
dynamic eventContent = eventUpdate.content; Map<String, dynamic> eventContent = eventUpdate.content;
String type = eventUpdate.type; String type = eventUpdate.type;
String chat_id = eventUpdate.roomID; String chat_id = eventUpdate.roomID;
@ -222,8 +222,13 @@ class Store {
if (eventContent["status"] is num) status = eventContent["status"]; if (eventContent["status"] is num) status = eventContent["status"];
// Make unsigned part of the content // Make unsigned part of the content
if (eventContent["unsigned"] is Map<String, dynamic>) if (eventContent.containsKey("unsigned")) {
eventContent["content"]["unsigned"] = eventContent["unsigned"]; Map<String, dynamic> newContent = {
"unsigned": eventContent["unsigned"]
};
eventContent["content"].forEach((key, val) => newContent[key] = val);
eventContent["content"] = newContent;
}
// Get the state_key for m.room.member events // Get the state_key for m.room.member events
String state_key = ""; String state_key = "";
@ -232,9 +237,14 @@ class Store {
} }
// Save the event in the database // Save the event in the database
if ((status == 1 || status == -1) && eventContent["txid"] is String) if ((status == 1 || status == -1) &&
txn.rawUpdate("UPDATE Events SET status=?, id=?, WHERE id=?", eventContent["unsigned"] is Map<String, dynamic> &&
[status, eventContent["event_id"], eventContent["txid"]]); eventContent["unsigned"]["transaction_id"] is String)
txn.rawUpdate("UPDATE Events SET status=?, id=? WHERE id=?", [
status,
eventContent["event_id"],
eventContent["unsigned"]["transaction_id"]
]);
else else
txn.rawInsert( txn.rawInsert(
"INSERT OR REPLACE INTO Events VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)", [ "INSERT OR REPLACE INTO Events VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)", [
@ -250,7 +260,8 @@ class Store {
]); ]);
// Is there a transaction id? Then delete the event with this id. // Is there a transaction id? Then delete the event with this id.
if (eventUpdate.content.containsKey("unsigned") && if (status != -1 &&
eventUpdate.content.containsKey("unsigned") &&
eventUpdate.content["unsigned"]["transaction_id"] is String) eventUpdate.content["unsigned"]["transaction_id"] is String)
txn.rawDelete("DELETE FROM Events WHERE id=?", txn.rawDelete("DELETE FROM Events WHERE id=?",
[eventUpdate.content["unsigned"]["transaction_id"]]); [eventUpdate.content["unsigned"]["transaction_id"]]);