Commit graph

503 commits

Author SHA1 Message Date
Valere
0997d9abf4 Merge branch 'develop' into cross_signing 2019-12-30 14:27:47 +01:00
Benoit Marty
35b4d90e0d ktlint 2019-12-20 17:54:35 +01:00
ganfra
83126d5f55 Fix android tests not working 2019-12-20 11:54:59 +01:00
ganfra
a6afd2e904 Timeline: handle failure when navigating to an unknown event (+ clean some files) 2019-12-19 16:10:59 +01:00
Valere
cb595177a9 Fix test compilation 2019-12-12 13:37:17 +01:00
Benoit Marty
a3111dc2d8 Login screens: rename a few classes and packages 2019-11-22 12:15:19 +01:00
Benoit Marty
2929b8f617 Ensure Android tests compile and fix warnings 2019-10-24 17:24:42 +02:00
Benoit Marty
15dc4d6369 Fix ktlint issue automatically by running ./ktlint --android -v -F 2019-10-09 15:24:05 +02:00
Dominic Fischer
456908c851
Merge branch 'develop' into kt-remove_java_util 2019-08-06 18:27:39 +01:00
ganfra
9cc922a8a2 Optimize imports 2019-08-02 11:35:27 +02:00
ganfra
fd09a1224e Remove Try from suspending functions 2019-08-01 17:15:17 +02:00
Dominic Fischer
02e342849f Remove most usages of the java.util package
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2019-07-21 23:23:56 +01:00
ganfra
b8669d5ed2 Sync: use a single threaded executor to ensure we have only one sync at a time 2019-07-11 10:23:24 +02:00
Benoit Marty
c5dc9d4a9a Fix test 2019-07-09 18:29:32 +02:00
Benoit Marty
e9700e04d8 Move method to JsonCanonicalizer and fix test compilation 2019-07-09 18:04:19 +02:00
ganfra
cbfd2af74b Start branching TimelineEventEntity 2019-07-05 16:07:12 +02:00
Benoit Marty
e9eada77f9 Add comment to run sonar analysis and fix compilation issue 2019-07-03 15:42:35 +02:00
Benoit Marty
cea8abb9b1 Fix issue in test and add a test for Json canonicalization (will pass when reply_e2e branch will be merged) 2019-06-28 14:27:08 +02:00
ganfra
b2d2582e0f Merge branch 'develop' into feature/dagger [WIP] 2019-06-26 20:58:46 +02:00
ganfra
07fee8ed3d Dagger: continue reworking on app and sdk [WIP] 2019-06-20 19:26:59 +02:00
Benoit Marty
8c0a1ed37d Rename "sender" to "senderId" for code clarity 2019-06-18 16:11:24 +02:00
ganfra
3d465f6fdf Start to introduce Dagger into SDK [WIP] 2019-06-14 16:32:23 +02:00
Benoit Marty
f6c36670c3 Rename class members and class name for code clarity 2019-06-11 13:32:09 +02:00
ganfra
81330d30cf Merge branch 'develop' into feature/crypto 2019-06-07 18:53:24 +02:00
ganfra
e125862794 Crypto: start reworking threading - WIP (to squash) 2019-06-04 16:26:37 +02:00
ganfra
3d50393b33 Crypto: continue cleaning. Need threading refactoring 2019-06-03 18:39:37 +02:00
Valere
99925d7cf9 Local echo for reactions/edits/redacts 2019-05-29 18:43:33 +02:00
ganfra
3519ad7c8d Crypto : WIP 2019-05-23 19:12:06 +02:00
Valere
efcac6b3e4 Fix / Missing schema for realm 2019-05-21 09:50:10 +02:00
Valere
6eafa3c43d Undo Reaction 2019-05-20 10:16:00 +02:00
ganfra
2780ca30a8 Merge branch 'feature/invites' into develop 2019-05-17 17:38:09 +02:00
Benoit Marty
340830d45f Test passed 2019-05-17 15:21:44 +02:00
Benoit Marty
e70fd8e351 canonicalize 2019-05-16 15:36:51 +02:00
Valere
d68b447874 Relations Model + Aggregation + Reactions Summary 2019-05-16 09:21:10 +02:00
ganfra
c39cfbe2ae Invites : allow to accept or reject the invite + clean some code. Require UI polishing. 2019-05-07 19:33:58 +02:00
ganfra
694df9d845 Timeline : fix some timeline rendering issues (senderName, merge item, left event). Still need to work on it. 2019-05-06 14:26:41 +02:00
ganfra
be6a4efacb Timeline : make tests compile and pass 2019-04-01 15:18:52 +02:00
ganfra
4154df7c21 Timeline : stabilize the pagedList replacement. Seems ok for phase0 2019-03-27 19:57:36 +01:00
ganfra
2898eae566 Timeline : reactivate loaders and get off the main thread 2019-03-20 16:24:50 +01:00
ganfra
c12bc5e02d Timeline rework : first version working for backward navigation (need more testing) 2019-03-15 19:27:56 +01:00
ganfra
9dccad11fe Update copyright and add to last merged commits 2019-01-25 14:04:59 +01:00
ganfra
57db4086cb Start adding javadoc on public api of the SDK and move some files. 2019-01-18 16:26:17 +01:00
ganfra
9914939045 Add copyright to source code 2019-01-18 11:12:08 +01:00
ganfra
ac2d20ad3f Migration androidx : first commit where it compiles. Updates some libs and android studio version in the same time. 2019-01-16 19:25:43 +01:00
ganfra
b2cdeb87f4 Fix some timeline issues and rename EnrichedEvent to TimelineEvent as it's only used in this context. 2019-01-14 16:46:54 +01:00
ganfra
de90cbe73e Timeline : fix merging issues 2019-01-14 16:46:54 +01:00
ganfra
84645c17c8 Makes tests compile 2019-01-14 16:46:54 +01:00
ganfra
d9e24558ec Makes task configurable to allow choosing threads 2018-12-17 16:42:22 +01:00
ganfra
faa68f4d52 Start testing timeline. Not working at the moment, have to figure it out. 2018-12-14 19:23:49 +01:00
ganfra
c8c31172b3 Try to configure okreplay for testing network + start to rework koin modules 2018-12-12 21:15:01 +01:00
ganfra
6ee272c376 Chunk : add some tests on merge 2018-12-11 16:39:44 +01:00
ganfra
0266380485 Start introducing tests 2018-12-11 15:36:09 +01:00
ganfra
b406e8301a first commit 2018-10-03 17:58:12 +02:00