Commit graph

1185 commits

Author SHA1 Message Date
Sorunome d8cb53e32f Merge branch 'krille/fix-send-again' into 'master'
Fix send again

See merge request famedly/famedlysdk!351
2020-06-20 19:50:08 +00:00
Sorunome bb73b4ea2f Merge branch 'krille/fix-database-transaction' into 'master'
Database transaction workaround

See merge request famedly/famedlysdk!352
2020-06-19 15:29:03 +00:00
Christian Pauly f1579a5f0f Database transaction workaround 2020-06-19 15:28:03 +02:00
Christian Pauly ee2974e51e Fix send again 2020-06-19 14:05:53 +02:00
Christian Pauly 9f8d170dd4 Fix sending sort order 2020-06-19 14:00:32 +02:00
Marcel b8c6decafc Merge branch 'soru/wal' into 'master'
Better format switching to WAL mode

See merge request famedly/famedlysdk!349
2020-06-16 12:36:33 +00:00
Sorunome 12bdddee03
Better format switching to WAL mode 2020-06-16 14:26:37 +02:00
Sorunome b1ec508666
Merge branch 'master' into soru/cross-signing 2020-06-16 12:58:30 +02:00
Marcel 13b2c2602b Merge branch 'soru/sqlite-wal' into 'master'
switch database to wal mode

See merge request famedly/famedlysdk!348
2020-06-16 10:57:29 +00:00
Sorunome 77378e3ebc
switch database to wal mode 2020-06-16 12:51:29 +02:00
Sorunome fca86d09d6 Merge branch 'patch-1' into 'master'
Update CODEOWNERS

See merge request famedly/famedlysdk!347
2020-06-15 12:40:23 +00:00
Niklas Zender 4e6b1174a6 Update CODEOWNERS 2020-06-15 12:34:28 +00:00
Sorunome c4d09268a0
add key verification test 2020-06-15 13:12:59 +02:00
Sorunome e2c358f319
format 2020-06-15 10:48:35 +02:00
Sorunome c4491fe97b
fix 2020-06-15 10:42:10 +02:00
Sorunome a88460b9d5
also test storing a decrytped room udpate 2020-06-15 10:39:26 +02:00
Sorunome 0e0fd61c65
remove unneded print 2020-06-15 10:27:28 +02:00
Sorunome e874a5e00b
add signature verification tests 2020-06-15 10:26:50 +02:00
Sorunome 9b2952435f
add matrix api tests 2020-06-13 20:44:25 +02:00
Sorunome c233d57f9f
add online key backup test 2020-06-13 19:48:38 +02:00
Sorunome 9f3e069687
Merge branch 'soru/cross-signing' of gitlab.com:famedly/famedlysdk into soru/cross-signing 2020-06-13 19:14:35 +02:00
Sorunome ef0a567401
finish ssss tests 2020-06-13 19:12:32 +02:00
Sorunome e0251eda55
finish ssss tests 2020-06-13 18:10:24 +02:00
Sorunome 7803dc4b93
add more tests 2020-06-13 10:56:39 +02:00
Sorunome 34619c065b
format 2020-06-12 17:40:08 +02:00
Sorunome 221d6c275b
fix timer stuffs 2020-06-12 17:32:35 +02:00
Sorunome aed1cf1270
handle ssss cache fetching better 2020-06-12 17:15:26 +02:00
Sorunome 6a36bb2d01
fix pipeline 2020-06-12 16:25:26 +02:00
Sorunome 3825f7292f
format 2020-06-12 16:17:28 +02:00
Sorunome 2a6a19e2b0
Request-ify room key store stuff 2020-06-12 16:17:00 +02:00
Sorunome fc5400a30c
Merge branch 'master' into soru/cross-signing 2020-06-12 14:34:22 +02:00
Christian Pauly 8db8972c2f Merge branch 'soru/fix-key-sharing' into 'master'
fix key request sending

See merge request famedly/famedlysdk!345
2020-06-12 12:32:43 +00:00
Sorunome 1a98634fd6 fix key request sending 2020-06-12 12:32:42 +00:00
Sorunome 5334266529
Merge branch 'master' into soru/cross-signing 2020-06-10 16:25:08 +02:00
Christian Pauly a61efa0384 Merge branch 'soru/fix-state-attack' into 'master'
Fix state attack

See merge request famedly/famedlysdk!343
2020-06-10 14:17:57 +00:00
Sorunome f485ca29d8 Fix state attack 2020-06-10 14:17:57 +00:00
Christian Pauly 7ee7afb7be Merge branch 'soru/hotfix-decryption' into 'master'
Hotfix decryption can request session

See merge request famedly/famedlysdk!344
2020-06-10 14:17:40 +00:00
Sorunome 485d88b896
Hotfix decryption can request session 2020-06-10 12:11:10 +02:00
Sorunome f261f35712
Merge branch 'master' into soru/cross-signing 2020-06-10 11:33:24 +02:00
Sorunome d660749a56 Merge branch 'ChristianPauly-master-patch-74314' into 'master'
Hotfix OpenIdCredentials

See merge request famedly/famedlysdk!342
2020-06-10 09:12:56 +00:00
Christian Pauly 5487b62360 Hotfix OpenIdCredentials 2020-06-10 09:12:55 +00:00
Christian Pauly d53003c0bd Merge branch 'soru/decrypt-more-events' into 'master'
Allow requesting and updating of session keys with lower index and lower forwarded chain

Closes #76

See merge request famedly/famedlysdk!341
2020-06-10 08:55:43 +00:00
Sorunome 7ddb6be30e
Allow requesting and updating of session keys with lower index and lower forwarded chain 2020-06-10 10:44:22 +02:00
Sorunome 9b00b9b158 Merge branch 'ChristianPauly-master-patch-69853' into 'master'
Hotfix setPushers

See merge request famedly/famedlysdk!340
2020-06-10 06:41:40 +00:00
Christian Pauly cf430cc546 Hotfix setPushers 2020-06-10 06:36:16 +00:00
Sorunome 6d49b4def3
Merge branch 'master' into soru/cross-signing 2020-06-09 20:24:22 +02:00
Sorunome b8c58faaab Merge branch 'soru/modularize-e2ee' into 'master'
split encryption stuff to other library

See merge request famedly/famedlysdk!333
2020-06-09 16:13:23 +00:00
Sorunome cf56e81850 Merge branch 'ChristianPauly-master-patch-33412' into 'master'
Fix request openID

See merge request famedly/famedlysdk!339
2020-06-09 16:11:28 +00:00
Christian Pauly 0e33634e1a Fix request openID 2020-06-09 16:05:41 +00:00
Christian Pauly a2f7dd4223 Merge branch 'soru/fix-canonical-alias' into 'master'
fix canonical alias sometimes being null

See merge request famedly/famedlysdk!337
2020-06-09 10:11:00 +00:00