filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,505 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

8505 Commits

Author SHA1 Message Date
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc 
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
 2021-04-09 11:57:11 +02:00
SpiritCroc 5bfc106a33 [TMP] Automatic upstream merge preparation 
Change-Id: I8850efdce1c1c8d1b1ff08471634d012810d95a4
 2021-04-09 11:55:41 +02:00
SpiritCroc 2407c905fe Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I0a3b0614e9533b7c572205eb571c21afa325cc7e
 2021-04-09 11:55:41 +02:00
SpiritCroc 61e9bfce5b pre_merge.sh: Fix when last merge was not tagged 
Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9
 2021-04-09 11:55:15 +02:00
Benoit Marty a6c43f4638 Merge branch 'develop' 2021-03-18 10:36:22 +01:00
Benoit Marty 1596df64a6 Revert "Version++" 
This reverts commit 810ee6d4c4.
 2021-03-18 10:36:06 +01:00
Benoit Marty ab120d32e2 Merge branch 'release/1.1.3' into develop 2021-03-18 10:35:10 +01:00
Benoit Marty 1eda7fa5bb Prepare release 1.1.3 2021-03-18 10:35:03 +01:00
Benoit Marty ef6e57066b
Merge pull request #3018 from vector-im/feature/bma/improve_perf 
Fix issue with Realm in UpdateTrustWorker
 2021-03-18 10:27:54 +01:00
Benoit Marty bab01ea309
Merge branch 'develop' into feature/bma/improve_perf 2021-03-17 18:10:14 +01:00
Benoit Marty 6aeca212f4
Merge pull request #3008 from vector-im/feature/fga/fix_ui_timeline 
Feature/fga/fix UI timeline
 2021-03-17 15:20:21 +01:00
Benoit Marty 67ff43cecc Changelog 2021-03-17 15:04:39 +01:00
Benoit Marty 1f82b1442d
Merge branch 'develop' into feature/fga/fix_ui_timeline 2021-03-17 15:03:22 +01:00
Benoit Marty 192fc6fd94 Use minimum delay accepted by the Work library. The current value is 10_000 and smaller value will be ignored. 
It will remove the warning "W/WM-WorkSpec: Backoff delay duration less than minimum value"
 2021-03-17 14:54:15 +01:00
Benoit Marty a4f6fe0cd2 Cleanup 2021-03-17 12:43:05 +01:00
Benoit Marty 616d3c1988 Fix IllegalStateException in UpdateTrustWorker 
Also split into 2 methods
 2021-03-17 12:42:28 +01:00
ganfra 174e938b5b Fix padding layout 2021-03-17 11:44:22 +01:00
Benoit Marty e89e0724a0 limit log 2021-03-17 11:04:17 +01:00
Benoit Marty 1d1f78a020 Timber.d instead of Timber.v 2021-03-17 10:39:25 +01:00
Benoit Marty 5edf7ca520 Version++ 2021-03-16 22:31:25 +01:00
Benoit Marty 810ee6d4c4 Version++ 2021-03-16 22:09:41 +01:00
Benoit Marty f12720aeb3 Merge branch 'release/1.1.2' into develop 2021-03-16 22:08:39 +01:00
Benoit Marty ab260e79eb Merge branch 'release/1.1.2' 2021-03-16 22:08:39 +01:00
Benoit Marty 2d64fe96c1 Prepare release 1.1.2 2021-03-16 22:08:29 +01:00
ganfra 616a46294c Update CHANGES 2021-03-16 20:14:20 +01:00
ganfra c9691b04ad Timeline: fix separators background 2021-03-16 20:11:10 +01:00
ganfra 1bc431198e Timeline: fix ripple on text item 2021-03-16 20:10:47 +01:00
Benoit Marty 5ce984ce3f
Merge pull request #3006 from vector-im/feature/bca/fix_video_wont_play 
Regression: Video will not play upon tap
 2021-03-16 18:32:20 +01:00
Valere 3b5dacd7e2
Merge branch 'develop' into feature/bca/fix_video_wont_play 2021-03-16 16:15:24 +01:00
Benoit Marty f90bc17eb3
Merge pull request #3005 from vector-im/feature/bma/restore_code 
Restore code
 2021-03-16 15:54:57 +01:00
Valere a52d20eeff Regression: Video will not play upon tap 2021-03-16 15:26:06 +01:00
Benoit Marty b3ccd788f6
Merge pull request #2997 from ShadowJonathan/no-bold 
Change ISSUE_TEMPLATE bold lines to proper headers
 2021-03-16 15:03:15 +01:00
Benoit Marty 12b927f951
Merge pull request #3004 from vector-im/feature/bca/workaround_stuck_message 
Quick Work around to remove stuck messages
 2021-03-16 15:01:02 +01:00
Benoit Marty e541a3b962
Merge branch 'develop' into feature/bca/workaround_stuck_message 2021-03-16 15:00:55 +01:00
Benoit Marty 9492887345 Restore call to clearUnavailableServersList() removed by mistake 
See https://github.com/vector-im/element-android/pull/3001#pullrequestreview-613195611
 2021-03-16 14:53:15 +01:00
Benoit Marty 641ce206c2 Move change to correct release version (#3001) 2021-03-16 14:48:27 +01:00
Benoit Marty 4273a6a1be
Merge pull request #3001 from timokoesters/fix-parsing-servername 
fix: make cross signing work with server names containing :
 2021-03-16 14:46:47 +01:00
Benoit Marty c80564e1b1
Merge pull request #2989 from vector-im/feature/bma/rr 
Feature/bma/rr
 2021-03-16 14:46:23 +01:00
Benoit Marty 431d450fec
Merge branch 'develop' into feature/bma/rr 2021-03-16 14:46:10 +01:00
Benoit Marty a30660ed43 Cleanup 2021-03-16 14:44:40 +01:00
Valere b93200f371 unused params 2021-03-16 14:31:37 +01:00
Benoit Marty 4ad0eb3db2
Merge pull request #2999 from vector-im/feature/bma/shields 
Shields optimization
 2021-03-16 13:31:56 +01:00
Benoit Marty cb17fa60dc Ganfra's review: delete files after the Realm transaction 2021-03-16 13:29:38 +01:00
Valere 5b94540f76 Quick Work around to remove stuck messages 2021-03-16 12:16:11 +01:00
Benoit Marty e8bb3d81ed Ganfra's review: inject Moshi Moshi 2021-03-16 12:15:28 +01:00
SpiritCroc 8f378aafea Jump to recent button: accent color like FAB in chat overview 
Change-Id: Ie0bef66add3b329d0c0624be825d4c49797b7534
 2021-03-16 10:26:11 +01:00
Timo Kösters dd2a7397a4
fix: make cross signing work with server names containing : 
Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name
User ids on the other hand are not allowed to contain ':', even
historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids

Therefore we can use the first instance of ':' to split the user
localpart from the server name.
 2021-03-15 22:31:34 +01:00
Benoit Marty e7c9fb987c Use AwaitTransaction (G's review) 2021-03-15 18:08:33 +01:00
Benoit Marty 4f3734f932 Ensure message are decrypted in the room list after a clear cache 2021-03-15 16:53:19 +01:00
Benoit Marty 4302d50af9 We do not display shield in the room list anymore 
Room member are lazy loaded, so the shield may not be accurate anymore.
 2021-03-15 16:09:08 +01:00