Commit Graph

1351 Commits

Author SHA1 Message Date
Sorunome fddced2b3a
fix: Properly handle initial device key uploading failures and better handle OTK upload failures 2021-01-12 12:56:23 +01:00
Krille Fear 0a89ac5564 Merge branch 'krille/jsonparsing' into 'main'
refactor: Add json parsing for encryption and encrypted content

See merge request famedly/famedlysdk!606
2021-01-08 12:29:11 +00:00
Christian Pauly 8b13df8c9d refactor: Add json parsing for encryption and encrypted content 2021-01-08 13:26:25 +01:00
Krille Fear 734431d553 Merge branch 'krille/olm-exceptions' into 'main'
refactor: Olm Exceptions

See merge request famedly/famedlysdk!605
2021-01-07 11:57:38 +00:00
Christian Pauly 39b776716c refactor: Olm Exceptions 2021-01-07 12:53:49 +01:00
Sorunome 33500012b2 Merge branch 'soru/other-aggregation-order' into 'main'
fix: Prioritize specced replies over unspecced event aggregations

See merge request famedly/famedlysdk!603
2021-01-05 14:44:56 +00:00
Sorunome c22615d8cd
fix: Prioritize specced replies over unspecced event aggregations 2021-01-05 15:32:47 +01:00
Sorunome 6be4ff0b24 Merge branch 'krille/encryption-background' into 'main'
fix: Dont run background task after logged out

See merge request famedly/famedlysdk!604
2021-01-05 14:23:20 +00:00
Christian Pauly 88403d19ba fix: Dont run background task after logged out 2021-01-05 15:15:39 +01:00
Krille Fear 2efe404e13 Merge branch 'soru/disable-master-autoverify' into 'main'
fix: Disable auto-verify own master key for now

See merge request famedly/famedlysdk!602
2021-01-05 13:58:37 +00:00
Krille Fear 7fe183d527 Merge branch 'krille/bootstrap-logs' into 'main'
refactor: Add verbose logs and refactor something

See merge request famedly/famedlysdk!601
2021-01-05 13:56:20 +00:00
Sorunome a0f7dd4732
fix: Disable auto-verify own master key for now 2021-01-05 14:54:40 +01:00
Christian Pauly e806bb9770 refactor: Add verbose logs and refactor something 2021-01-05 14:44:15 +01:00
Nicolas Werner 877245f146 Merge branch 'krille/licenseheader' into 'main'
chore: Update license header

See merge request famedly/famedlysdk!600
2021-01-04 13:12:10 +00:00
Christian Pauly 9ffecd845a chore: Update license header 2021-01-04 10:34:50 +01:00
Krille Fear 3c766dcfff Merge branch 'krille/externmatrixapi' into 'main'
refactor: External matrix api

See merge request famedly/famedlysdk!595
2021-01-04 09:31:07 +00:00
Christian Pauly e450a09fb5 refactor: External matrix api 2021-01-04 10:26:29 +01:00
Krille Fear 41df79c6ca Merge branch 'soru/matrix-string-event-parsing' into 'main'
feat: Add identifier string parsing

See merge request famedly/famedlysdk!599
2021-01-04 09:17:42 +00:00
Sorunome 19d96595cc
feat: Add identifier string parsing 2021-01-01 15:28:25 +01:00
Krille Fear 4d2c4df4d4 Merge branch 'soru/decrypt-file-in-background' into 'main'
fix: Don't block file decrypting

See merge request famedly/famedlysdk!598
2021-01-01 09:31:12 +00:00
Sorunome cd9f23d6c4
fix: Don't block file decrypting 2020-12-31 20:33:18 +01:00
Krille Fear 192c406cdf Merge branch 'soru/clear-in-memory-outbound-cache-properly' into 'main'
fix: Properly clear in-memory outbound sessions when clearing cache

See merge request famedly/famedlysdk!597
2020-12-31 13:24:25 +00:00
Sorunome f6589f9596
fix: Properly clear in-memory outbound sessions when clearing cache 2020-12-31 12:58:41 +01:00
Krille Fear ed8af418f0 Merge branch 'soru/throw-on-no-valid-olm-session' into 'main'
fix: Throw an error if all existing olm sessions are corrupted

See merge request famedly/famedlysdk!596
2020-12-31 09:48:55 +00:00
Sorunome 734ec0357b
fix: Throw an error if all existing olm sessions are corrupted 2020-12-31 10:45:22 +01:00
Sorunome 65d07609d4 Merge branch 'soru/debug-logs' into 'main'
chore: Add more debugging logs

See merge request famedly/famedlysdk!594
2020-12-30 17:54:00 +00:00
Sorunome 08dcce6225
chore: Add more debugging logs 2020-12-30 18:50:40 +01:00
Sorunome 92759ef56c Merge branch 'soru/load-multiple-olm-sessions' into 'main'
fix: Load multiple olm sessions from the database at once for increased performance

See merge request famedly/famedlysdk!593
2020-12-30 11:59:55 +00:00
Sorunome add19c73a0
fix: Load multiple olm sessions from the database at once for increased performance 2020-12-30 12:52:54 +01:00
Sorunome bbcc883777 Merge branch 'soru/lazy-send-keys' into 'main'
feat: Lazy-send room keys, chunked and sorted by importance

Closes #125

See merge request famedly/famedlysdk!580
2020-12-29 13:50:39 +00:00
Sorunome 6723c01a31
feat: Lazy-send room keys, chunked and sorted by importance 2020-12-29 14:46:36 +01:00
Krille Fear af0c402717 Merge branch 'soru/properly-handle-changes-x-signing-key' into 'main'
fix: properly handle changed cross-signing keys

Closes #128

See merge request famedly/famedlysdk!592
2020-12-29 13:40:22 +00:00
Sorunome 3ff958de4e
fix: properly handle changed cross-signing keys 2020-12-29 14:37:09 +01:00
Krille Fear 03b9c6e2ee Merge branch 'soru/animated-thumbnail' into 'main'
feat: Add animated property to thumbnails

See merge request famedly/famedlysdk!590
2020-12-29 09:38:47 +00:00
Sorunome 58044be1ba
feat: Add animated property to thumbnails 2020-12-29 10:32:18 +01:00
Sorunome 0a64ed2c6f Merge branch 'krille/nullcheck' into 'main'
fix: Missing null check

See merge request famedly/famedlysdk!591
2020-12-29 09:15:21 +00:00
Christian Pauly 19905e348a fix: Missing null check 2020-12-29 09:44:13 +01:00
Sorunome 71fb80aa1f Merge branch 'soru/megolm-session-on-typing' into 'main'
feat: Start megolm sessions while typing

See merge request famedly/famedlysdk!589
2020-12-28 15:21:07 +00:00
Sorunome 68afe362ce
feat: Start megolm sessions while typing 2020-12-28 16:14:07 +01:00
Sorunome bae9299fa1 Merge branch 'soru/e2ee-fixes' into 'main'
fix: Various small e2ee fixes

See merge request famedly/famedlysdk!588
2020-12-28 13:58:07 +00:00
Sorunome ccd03ecd22
fix: Various small e2ee fixes 2020-12-28 14:49:55 +01:00
Sorunome d93f420d38 Merge branch 'soru/deepcopy-map' into 'main'
chore: Implement a proper deep-copy function for json maps

See merge request famedly/famedlysdk!587
2020-12-28 13:38:21 +00:00
Sorunome 768baa7602
chore: Implement a proper deep-copy function for json maps 2020-12-28 14:35:21 +01:00
Christian Pauly c69a8ac927 Merge branch 'soru/fix-history-state-events' into 'main'
fix: Sort state events of history requests correctly

See merge request famedly/famedlysdk!586
2020-12-28 07:42:33 +00:00
Sorunome c6f718adcc
fix: Sort state events of history requests correctly 2020-12-27 10:55:41 +01:00
Sorunome 1fff05d663 Merge branch 'krille/fixtyping' into 'main'
fix: sendTypingNotification

Closes fluffychat#221

See merge request famedly/famedlysdk!585
2020-12-27 09:41:37 +00:00
Christian Pauly f91349a45e fix: sendTypingNotification 2020-12-27 09:58:14 +01:00
Christian Pauly bce0c1d485 Merge branch 'krille/magicstrings' into 'main'
refactor: Replace some magic strings

See merge request famedly/famedlysdk!584
2020-12-23 11:28:43 +00:00
Christian Pauly e2f2c124d2 Merge branch 'krille/clearlogs' into 'main'
fix: Clear logs on clear()

See merge request famedly/famedlysdk!583
2020-12-23 11:28:36 +00:00
Christian Pauly 79fe7b0878 refactor: Replace some magic strings 2020-12-23 12:14:16 +01:00