mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 18:36:21 +03:00
Code Issues Projects Releases Packages Wiki Activity
9659 commits 6 branches 120 tags 229 MiB
Commit graph

9659 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
c01142b813 Automatic upstream merge postprocessing 
Change-Id: I1c0d40ef25bef54205bb21ef0a9f03a12b427b83
 2021-06-02 17:49:37 +02:00
SpiritCroc
c00600666e Merge tag 'v1.1.9' into sc 
Change-Id: I75baba645677d13f9937643a29630070f1470f9c

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
 2021-06-02 17:49:34 +02:00
SpiritCroc
8b6e8ad3c5 [TMP] Automatic upstream merge preparation 
Change-Id: I12f25c8c45e1f120f1e05041fd281f02a3f6392d
 2021-06-02 17:04:48 +02:00
SpiritCroc
79e869b937 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I489bb26bdf4e5ac6a96388e45de3b080eda63c03
 2021-06-02 17:04:48 +02:00
SpiritCroc
bddc574766 Increment version 
Change-Id: I03d7c37b12b0f5e6af2a44dedf76c3aff154d716
 2021-06-02 16:51:11 +02:00
Benoit Marty
7f96749d63 Merge branch 'release/1.1.9' into main 2021-06-02 11:47:13 +02:00
Benoit Marty
a1ebf1a3bc Prepare release 1.1.9 - fastlane 2021-06-02 11:45:03 +02:00
Benoit Marty
ded3b19a44 Prepare release 1.1.9 - towncrier 2021-06-02 11:43:27 +02:00
Benoit Marty
701f549881
Merge pull request #3405 from vector-im/feature/bma/olm_upgrade 
Upgrade Olm dependency to 3.2.4
 2021-06-02 11:29:23 +02:00
SpiritCroc
ce95c398df Improve text display in RTL layouts with long display name pills 
Change-Id: Idc391dd39c55dcc7619d5da66b3f1f13cf38ad0e
 2021-06-02 10:42:13 +02:00
Benoit Marty
68833b0180 Upgrade Olm dependency to 3.2.4 2021-06-02 10:05:14 +02:00
Benoit Marty
34a2d813cb
Merge pull request #3443 from vector-im/feature/bca/stable_endpoint_2858 
stable ids for MSC 2858
 2021-06-01 16:17:20 +02:00
Valere
00ee61a2a0 stable ids for MSC 2858 2021-06-01 12:13:06 +02:00
SpiritCroc
e0fd3e584f Hide quote action in simplified mode 
Users mistake this for "reply". Also, it doesn't allow editing the quote
right now, so it's not really useful yet either.

Change-Id: Ie3b84bde91901ee658852929313cacd70a912225
 2021-06-01 10:41:44 +02:00
SpiritCroc
59cf7fc075 Re-enable swipe to reply by default 
Change-Id: I2bb4e8c003d2e535526227267534acd9bac131da
 2021-06-01 10:36:34 +02:00
Benoit Marty
f448799104
Merge pull request #3433 from vector-im/feature/bma/snowfall 
/snow -> /snowfall and update wording (iso Element Web) (#3430)
 2021-05-31 21:08:18 +02:00
waclaw66
51ec9d6811 Added Czech SC translation 2021-05-31 16:03:04 +02:00
SpiritCroc
0f43b49cbd Use original URL instead of thumbnail URL for GIFs 
- GIFs tend to be small enough to download directly
- Sometimes, thumbnails don't support animating

Change-Id: I9848d05f2f1565570f341847209712b9e4abfbac
 2021-05-31 15:40:38 +02:00
SpiritCroc
5f1d0a7c8d Play gifs in the timeline 
Change-Id: I8405248329664b42c982a8e7a573d042e43b46d0
 2021-05-31 15:15:22 +02:00
Benoit Marty
90a16ebbaf /snow -> /snowfall and update wording (iso Element Web) (#3430) 2021-05-31 11:03:02 +02:00
Benoit Marty
575ebdc3e8
Merge pull request #3421 from vector-im/feature/fga/call_transfer 
Feature/fga/call transfer
 2021-05-28 16:48:01 +02:00
Benoit Marty
fca74e9eb4 Small cleanup during review 2021-05-28 16:36:03 +02:00
Benoit Marty
270a195478
Merge pull request #3425 from vector-im/feature/fga/fix_crash_signout 
Fix crash on signout
 2021-05-28 15:44:02 +02:00
SpiritCroc
b28ca929a3 Image message footer: also show outside if more than 1/4 area covered 
Also, prefer footer on the side if possible.

Change-Id: I66b23de5d673317f4bc810190535c3028c541d8b
 2021-05-28 15:40:42 +02:00
Benoit Marty
5657da3493
Merge pull request #3401 from vector-im/feature/bca/spaces_fix_3386 
Fixes #3386 show space description in explore header
 2021-05-28 15:27:49 +02:00
SpiritCroc
6b7564f9f4 Do not notify again for old events 
Resending the notification here can trigger other system components or
apps that listen to new notifications, such as connected smart watches
or automation tools.

Hopefully fixes https://github.com/SchildiChat/SchildiChat-android/issues/11

Change-Id: I9fe77f8d32c802a14439179b054727733bbe1cf8
 2021-05-28 15:17:11 +02:00
ganfra
34b012732e Call transfer: handle unknown person correctly 2021-05-28 14:28:32 +02:00
Valere
8366437147 Fix unused variables 2021-05-28 12:10:20 +02:00
Valere
871360754e Code review 2021-05-28 11:12:10 +02:00
SpiritCroc
d13891d556 Also count DMs in space unread counts 
Change-Id: I494e6d6a8f5522b666dc9e573b19e3fc4737bc76
 2021-05-28 10:48:34 +02:00
ganfra
cc6263b20f Fix crash on signout 2021-05-28 10:29:21 +02:00
Benoit Marty
0db5dd3d50
Merge pull request #3419 from vector-im/feature/bma/gitter 
Feature/bma/gitter
 2021-05-27 21:23:05 +02:00
Benoit Marty
c3a754604f
Merge pull request #3423 from vector-im/feature/bma/compress_thumbnail 
Compress thumbnail: change Jpeg quality from 100 to 80 (#3396)
 2021-05-27 20:53:16 +02:00
Benoit Marty
302e29831e Compress thumbnail: change Jpeg quality from 100 to 80 (#3396) 2021-05-27 18:42:07 +02:00
Benoit Marty
d2fd652fb5
Merge pull request #3414 from vector-im/feature/bma/wording_homeserver 
Feature/bma/wording homeserver
 2021-05-27 17:32:27 +02:00
Benoit Marty
cc5a400cfd ktlint 2021-05-27 17:02:41 +02:00
Benoit Marty
f559ae1b35 Rename to avoid collision with Matrix Spaces 2021-05-27 16:55:40 +02:00
ganfra
8e8bc0055d Call transfer: clean & add changelog 2021-05-27 16:32:14 +02:00
Benoit Marty
3df8af27a6
Merge pull request #3416 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.24 
Bump libphonenumber from 8.12.23 to 8.12.24
 2021-05-27 16:05:37 +02:00
ganfra
bcc360692e Call transfer: makes call transfer working properly 2021-05-27 16:00:32 +02:00
Benoit Marty
e925d29037 Avoid adding twice the same server 2021-05-27 15:37:26 +02:00
Benoit Marty
96720af52f Let the View model compute the state 2021-05-27 15:16:55 +02:00
ganfra
90ccc3006d Merge develop into feature/fga/call_transfer 2021-05-27 14:40:06 +02:00
Benoit Marty
f62ab84e59 Add custom server - add IME action 2021-05-27 14:12:48 +02:00
Benoit Marty
8d0d7635c6 Single line set to true by default 2021-05-27 14:05:34 +02:00
Benoit Marty
d3949729e1 Quick fix for edittext issue 2021-05-27 14:05:34 +02:00
Benoit Marty
cbed1afaaa Add custom server 2021-05-27 14:05:34 +02:00
Benoit Marty
72b1bd354e
Merge pull request #3355 from vector-im/feature/fga/voip_virtual_room 
Feature/fga/voip virtual room
 2021-05-27 13:24:34 +02:00
Benoit Marty
ea4b5e19fe VoIP: add protocols checks and third party lookups 
Add RoomAccountData and handle RoomSyncAccountData
Virtual rooms: add CallUserMapper, branch onNewInvite and mapping, hide them on sdk side (not ideal solution)
Introduce SessionScopedProperty to handle session dependency in the app
Author: ganfra (rebased by Benoit)
 2021-05-27 10:28:32 +02:00
dependabot[bot]
7fb76b2541
Bump libphonenumber from 8.12.23 to 8.12.24 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.23 to 8.12.24.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.23...v8.12.24)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-27 06:23:10 +00:00