Commit Graph

928 Commits

Author SHA1 Message Date
Valere
e50dd265d4 merge develop 2019-07-08 10:58:41 +02:00
Valere
4521ea14ee Merge branch 'develop' into feature/realm_entity_rework 2019-07-08 10:55:20 +02:00
Valere
98a7652403 Put back local echo 2019-07-05 19:13:34 +02:00
ganfra
78951b9155 Timeline event: handle displayName/avatar [WIP] 2019-07-05 19:07:33 +02:00
Benoit Marty
8c86a653b2
Merge pull request #309 from vector-im/feature/crypto_cleanup
Rework Crypto using Try
2019-07-05 19:03:59 +02:00
Benoit Marty
ea0526821e Top left Back does not go to previous Activity anymore (Fixes #275) 2019-07-05 18:44:09 +02:00
Valere
c503445092 Branch back relation summaries 2019-07-05 18:38:20 +02:00
Benoit Marty
205af8b122
Merge pull request #280 from Dominaezzz/kotlinify-1
Enhance CancelableBag
2019-07-05 18:34:28 +02:00
Benoit Marty
3abb7c8de6
Merge pull request #308 from Dominaezzz/kotlinify-2
Some "Kotlinification"
2019-07-05 18:11:18 +02:00
Benoit Marty
a40510da3b
Merge pull request #310 from vector-im/feature/buildkite_pr
Build every branch which is not master, to be able to build PR from external repository
2019-07-05 18:06:14 +02:00
Benoit Marty
a6ab4a349d Build every branch which is not master, to be able to build PR from external repository 2019-07-05 18:02:13 +02:00
ganfra
79a704d240 Timeline : Uncomment liveChunk to make pagination working 2019-07-05 17:27:24 +02:00
Benoit Marty
e5adf174a8 Fix crash when invalid urls for image 2019-07-05 17:00:57 +02:00
Valere
f01e796271 Timeline is back 2019-07-05 17:00:13 +02:00
Benoit Marty
302d23ba96 Create a realm locker to fast up next Realm.getInstance calls 2019-07-05 16:28:15 +02:00
Benoit Marty
03050c3f25 Cleanup 2019-07-05 16:11:54 +02:00
ganfra
cbfd2af74b Start branching TimelineEventEntity 2019-07-05 16:07:12 +02:00
Benoit Marty
f3fab0dc08 Rename ErrorTypes 2019-07-05 15:52:37 +02:00
Benoit Marty
4a512d2425 Create enum for errorType and fix a few issues 2019-07-05 15:43:28 +02:00
Benoit Marty
07f80f43bd Display clear type 2019-07-05 15:15:55 +02:00
Benoit Marty
87dec337d8 Rework Crypto using Try 2019-07-05 14:41:32 +02:00
ganfra
b37877746a Introduce TimelineEventEntity to begin with the rework 2019-07-05 14:39:15 +02:00
Dominic Fischer
b0e5612bdc Convert java-esque code to Kotlin
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2019-07-05 12:32:21 +01:00
ganfra
25b0cd0e4b Remove some work from UI thread 2019-07-04 19:02:37 +02:00
Benoit Marty
2800d86a57
Merge pull request #302 from vector-im/feature/invitation
Quick action in invitation and composer input type
2019-07-04 18:47:44 +02:00
Benoit Marty
01bc0de2c2 Set again input type for composer, lost after merge 2019-07-04 18:43:36 +02:00
Benoit Marty
857a4c5a26 Quick implementation of accept/reject invitation from notification 2019-07-04 18:14:39 +02:00
Benoit Marty
063c35380a Fix regression on invitation full screen display 2019-07-04 16:44:37 +02:00
Benoit Marty
5322251bc0 Fix wording for direct message tab 2019-07-04 15:37:19 +02:00
Benoit Marty
c21b9df9a5 Fix issue with notification from previous account displayed after logout 2019-07-04 15:23:59 +02:00
Benoit Marty
f2a52f0253
Merge pull request #297 from vector-im/feature/crypto_stabilization
Safely remove all usage of `!![`
2019-07-04 15:17:26 +02:00
Benoit Marty
baaf493cb4
Merge pull request #299 from vector-im/feature/dix_concurrent_sync
Fix / Push worker could launch concurrent syncs
2019-07-04 15:10:18 +02:00
Benoit Marty
6cbd6d3a33 Valere's review 2019-07-04 14:59:29 +02:00
Benoit Marty
72e5aa981a
Merge pull request #298 from vector-im/feature/quote
Fix issue when quoting event in e2e rooms (Fixes #295)
2019-07-04 14:49:53 +02:00
Benoit Marty
c0f085cdf8 SyncTask now handles by itself the sync token 2019-07-04 14:46:59 +02:00
Valere
10bc2297d4 Fix / Push worker could launch concurrent syncs 2019-07-04 14:04:36 +02:00
Benoit Marty
8fa5e63b07 Fix issue: reply to e2e event does not contain the base message 2019-07-04 12:52:43 +02:00
Benoit Marty
9d0c50907c Fix issue when quoting event in e2e rooms (Fixes #295) 2019-07-04 12:39:59 +02:00
Benoit Marty
e5958983d8 Safely remove all usage of !![ 2019-07-04 11:44:09 +02:00
ganfra
ab23ec3f35 Fix https://github.com/matrix-org/riot-android-rageshakes/issues/5851 (DI) 2019-07-04 10:20:50 +02:00
ganfra
a79a6443e7 Realm: update realm dependencie 2019-07-03 20:08:27 +02:00
ganfra
9ff24cbf2a Merge branch 'feature/fix_issues' into develop 2019-07-03 19:46:34 +02:00
Valere
2eee25bbc1 Fix / crash not called on UI Thread 2019-07-03 19:36:25 +02:00
Valere
2a2431e490
Merge pull request #290 from vector-im/feature/fix_crash_npe_cryptomanager
Fix / Rageshake crashes + cleaning
2019-07-03 18:47:45 +02:00
Valere
4041e2e8ca code review 2019-07-03 18:40:42 +02:00
Valere
031c4e5746 Crash on loggout
https://github.com/matrix-org/riot-android-rageshakes/issues/5881
2019-07-03 18:40:04 +02:00
Valere
b4ea85fc76 Fix / Rageshake crashes + cleaning !!
https://github.com/matrix-org/riot-android-rageshakes/issues/5880
https://github.com/matrix-org/riot-android-rageshakes/issues/5877
https://github.com/matrix-org/riot-android-rageshakes/issues/5873
https://github.com/matrix-org/riot-android-rageshakes/issues/5871
2019-07-03 18:40:04 +02:00
ganfra
480f14902d Rx: observe on computation by default 2019-07-03 18:28:56 +02:00
Benoit Marty
20c8e8d922 Change the test to apply Google Service plugin to be able to run sonar 2019-07-03 18:18:07 +02:00
Benoit Marty
9cdecced57
Merge pull request #291 from vector-im/feature/start_crypto_earlier
Start crypto manager before handling first sync events
2019-07-03 18:05:44 +02:00