ganfra
b39a86edbd
Merge branch 'develop' into feature/joining_room
2020-08-26 17:06:31 +02:00
ganfra
b986bfd509
Permalink: handle via parameters
2020-08-26 16:37:48 +02:00
Benoit Marty
6376ba2516
Improve wording (visible in debug screen)
2020-08-25 17:48:12 +02:00
Benoit Marty
2e618999d9
Words containing my name should not trigger notifications ( Fixes #1781 )
...
It adds a specific behavior for rule with id RuleIds.RULE_ID_CONTAIN_USER_NAME
2020-08-25 17:26:54 +02:00
Benoit Marty
bf7a096a18
Refactor: Remove duplicated declaration for Actions
2020-08-25 17:01:55 +02:00
Benoit Marty
0d9885a1e0
Refactor: Remove duplicated declaration for RuleIds
2020-08-25 16:53:12 +02:00
Benoit Marty
aca8fd7f3d
Refactor: Kotlin style
2020-08-25 16:18:44 +02:00
Benoit Marty
f5ea4fb6ac
Refactor: Extract method to dedicated files
2020-08-25 16:15:42 +02:00
Benoit Marty
7b5c74f81c
Refactor: Condition is now an interface
2020-08-25 16:14:14 +02:00
Benoit Marty
558e11a364
Refactor: move Kind to its own file
2020-08-25 16:01:34 +02:00
Weblate
3d5b3c65de
Merge branch 'origin/develop' into Weblate.
2020-08-25 11:15:37 +00:00
ziriSut
51893fff09
Translated using Weblate (Kabyle)
...
Currently translated at 99.1% (233 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-24 17:42:31 +00:00
Kahina Messaoudi
25d8ba2699
Translated using Weblate (Kabyle)
...
Currently translated at 99.1% (233 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-24 17:42:31 +00:00
Slavi Pantaleev
ee7f79b40c
Translated using Weblate (Bulgarian)
...
Currently translated at 72.3% (170 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/bg/
2020-08-24 17:42:28 +00:00
Tobias Preuss
ed98613b2d
Use File extension functions to make code more concise.
...
+ This change replaces a few usages of ByteArrayInputStream, FileInputStream,
FileOutputStream with their equivalent Kotlin extension functions.
2020-08-24 18:01:30 +02:00
Benoit Marty
69e9a79ac1
Inject StringProvider instead of Context
2020-08-24 14:49:42 +02:00
Kahina Messaoudi
8b41b014ee
Translated using Weblate (Kabyle)
...
Currently translated at 96.6% (227 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 15:46:17 +00:00
ziriSut
601cf10fb4
Translated using Weblate (Kabyle)
...
Currently translated at 96.6% (227 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 15:46:16 +00:00
Kahina Messaoudi
f02ee2af27
Translated using Weblate (Kabyle)
...
Currently translated at 72.3% (170 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 14:38:55 +00:00
ziriSut
c490d6bcd1
Translated using Weblate (Kabyle)
...
Currently translated at 72.3% (170 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 14:38:55 +00:00
ziriSut
64b6b069a4
Translated using Weblate (Kabyle)
...
Currently translated at 69.4% (163 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 14:32:38 +00:00
Kahina Messaoudi
edd455a772
Translated using Weblate (Kabyle)
...
Currently translated at 69.4% (163 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 14:32:38 +00:00
Kahina Messaoudi
a54c1af7cc
Translated using Weblate (Kabyle)
...
Currently translated at 39.6% (93 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 12:09:01 +00:00
ziriSut
9e1fe22c19
Translated using Weblate (Kabyle)
...
Currently translated at 39.6% (93 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 12:09:01 +00:00
Kahina Messaoudi
bd033ed5f4
Translated using Weblate (Kabyle)
...
Currently translated at 7.2% (17 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 06:37:58 +00:00
Slimane Selyan AMIRI
2fd9333fb0
Translated using Weblate (Kabyle)
...
Currently translated at 7.2% (17 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 06:37:57 +00:00
Slimane Selyan AMIRI
385de03f40
Added translation using Weblate (Kabyle)
2020-08-22 18:05:34 +00:00
Benoit Marty
20e2b3beb8
Merge pull request #1978 from vector-im/feature/ttl
...
Improve #1971 , especially be robust about system time change
2020-08-21 18:12:35 +02:00
Benoit Marty
06f4b95dc0
Merge branch 'develop' into feature/networkonmainthread
2020-08-21 16:48:11 +02:00
Benoit Marty
008bc0116d
Improve #1971 , especially be robust about system time change
2020-08-21 16:36:45 +02:00
Benoit Marty
de728f6c36
Merge pull request #1971 from tzeitlho/turn_fix
...
Turn fix
2020-08-21 16:28:52 +02:00
Benoit Marty
a8c6678efc
Avoid NetworkOnMainThreadException when setting a user avatar
2020-08-21 16:11:22 +02:00
Thomas Zeitlhofer
a732d8856b
change var -> val according to review comment
...
Signed-off-by: Thomas Zeitlhofer <tz+github@ze-it.at>
2020-08-21 14:28:18 +02:00
Benoit Marty
5416f4194c
Fix lint issue
2020-08-21 12:27:57 +02:00
Benoit Marty
b09c1e3cbf
Format strings
2020-08-21 12:23:25 +02:00
Weblate
43d0a11cba
Merge branch 'origin/develop' into Weblate.
2020-08-21 09:30:51 +00:00
Thomas Zeitlhofer
a7ee7d5bad
Renew turnserver credentials when ttl runs out
...
The previous implementation caches the turnserver response indefinitely.
This breaks VoIP calls as soon as the ttl of the received turnserver
credentials runs out. So, take care to renew the turnserver credentials
by allowing the cache to expire.
Fixes: d8cf44fdc9
("Simple cache of turn server response")
Signed-off-by: Thomas Zeitlhofer <tz+github@ze-it.at>
2020-08-20 19:43:52 +02:00
Onuray Sahin
80551fc0c2
Fix IllegalArgumentException: Receiver not registered: NetworkInfoReceiver ( #1961 )
...
Fix IllegalArgumentException: Receiver not registered: NetworkInfoReceiver (#1961 )
Co-authored-by: Onuray Sahin <onurays@element.io>
2020-08-20 18:31:03 +02:00
Benoit Marty
112a7913d4
Improve (unused) code
2020-08-20 17:57:48 +02:00
Benoit Marty
cab447e44e
Add missing copyright
2020-08-20 17:50:43 +02:00
Benoit Marty
fde2bdf304
Create a PermalinkFactory to avoid injecting the service in SDK classes
2020-08-20 17:41:01 +02:00
Benoit Marty
2c90e33ceb
Move package
2020-08-20 17:33:55 +02:00
Benoit Marty
af10344b6b
Share button in rooms gives room ID link without via parameters ( #1927 )
...
Following the algorithm described in #1927
Create a PermalinkService
2020-08-20 17:33:55 +02:00
Benoit Marty
828bf44b2b
Better handling DM creation when invitees cannot be inviting due to denied federation
...
As we do not know the created roomId, we cannot add it to the DM list though. But at least the user is informed that a room has been created and won't retry because the screen will be closed.
2020-08-20 15:44:28 +02:00
Benoit Marty
c6c8ef07a6
Fail first (before creating the room) when trying to create a DM without at least one invitee
2020-08-20 15:34:58 +02:00
Benoit Marty
db9c418622
We are already in a Coroutine scope, we can directly call execute() on the task.
...
-> It will prevent the callback from being called twice.
2020-08-19 18:04:22 +02:00
Marcelo Filho
97fa087496
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/pt_BR/
2020-08-19 15:42:46 +00:00
Benoit Marty
0a296908a8
Merge branch 'develop' into feature/update_element_config_file_parsing
2020-08-18 18:31:28 +02:00
Peter Vágner
413c21505c
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/sk/
2020-08-18 09:23:31 +00:00
Marcelo Filho
ce367f6e17
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/pt_BR/
2020-08-17 22:42:25 +00:00
Tilo Spannagel
8c7956d935
Remove old code that was used on devices with api level <21
...
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2020-08-17 21:20:39 +02:00
Benoit Marty
bde77784b9
Add internal
2020-08-17 19:46:44 +02:00
Benoit Marty
112f77c4e0
#1682 : try to fetch config.domain.json
2020-08-17 19:39:29 +02:00
Benoit Marty
c11c28b406
#1682 : parse "default_server_config"
2020-08-17 19:27:13 +02:00
Hubert Chathi
abd478ad3c
Translated using Weblate (German)
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/de/
2020-08-16 21:42:21 +00:00
Priit Jõerüüt
8ae3ffba32
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/et/
2020-08-14 22:42:20 +00:00
Benoit Marty
4f8fd7b994
Benoit's review
...
- Cleanup
- Force refresh of HomeServerCapabilities
- add some doc
- remove dead code
- remove commented code
- remove duplicated comment
- use getBestName()
- improve code formatting
- Fix isAudioOnly parameter in jitsi url
- Fix layout issue between "Active conference" banner and "Jump to first unread message banner"
- Improve "Active conference" banner
- Remove Calendar permission from Manifest
2020-08-14 15:40:02 +02:00
Valere
8c150aa3e8
klint
2020-08-14 10:00:02 +02:00
Valere
3ce1e3e5d9
Add/Remove jitsi widget via option menu
2020-08-14 09:45:33 +02:00
Valere
42a24300a1
Initial commit jitsi
2020-08-14 09:31:24 +02:00
Benoit Marty
81a4b5edbc
Merge pull request #1905 from vector-im/feature/refresh_device_list
...
Live sessions list
2020-08-13 17:13:36 +02:00
Benoit Marty
3103fe970a
Ensure users do not accidentally ignore other users ( #1890 )
...
- Wording: use "Ignore" instead of "Block" for consistency across the app and with other Element app
2020-08-13 16:44:32 +02:00
Benoit Marty
7a2454d816
Fix refreshing of sessions list when another session is logged out
...
Rx: use distinctUntilChanged() instead of distinct()
2020-08-13 16:27:04 +02:00
Benoit Marty
cdc60cd453
Add missing Copyright
2020-08-13 15:41:05 +02:00
Benoit Marty
894f5b9ed3
Add copyright to SDK Kotlin source file
2020-08-13 15:41:05 +02:00
Benoit Marty
8f1adf6316
Ensure deserialization of previously stored objects still works
...
After package has been renamed from `im.vector.matrix.android` to `org.matrix.android.sdk`
2020-08-13 15:41:05 +02:00
Benoit Marty
11b5512cb8
Rename package of SDK modules
2020-08-13 12:50:58 +02:00
Benoit Marty
617558a1ca
Format strings resource
2020-08-13 11:20:44 +02:00
Weblate
95e998b652
Merge branch 'origin/develop' into Weblate.
2020-08-13 08:48:02 +00:00
Marcelo Filho
dc17156024
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/pt_BR/
2020-08-13 06:42:18 +00:00
random
7299f938b5
Translated using Weblate (Italian)
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/it/
2020-08-13 06:42:18 +00:00
@a2sc:matrix.org
6bf6c53969
Translated using Weblate (German)
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/de/
2020-08-13 06:42:16 +00:00
linsui
d8850e046a
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/zh_Hans/
2020-08-13 06:42:16 +00:00
Akarshan Biswas
fb09f58ac8
Translated using Weblate (Bengali (India))
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/bn_IN/
2020-08-13 06:42:16 +00:00
Tobias Preuss
40f8e6061f
Use "Context#getSystemService" extension function provided by "core-ktx".
...
+ Re-use local variable where possible.
2020-08-09 16:16:06 +02:00
Artyom
d144dcf7d9
Translated using Weblate (Russian)
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/ru/
2020-08-07 14:42:27 +00:00
Xidorn Quan
a0ecb6ecc2
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/zh_Hans/
2020-08-07 14:42:12 +00:00
rkfg
0dd4563217
Translated using Weblate (Russian)
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/ru/
2020-08-06 03:43:04 +00:00
Marcelo Filho
b90be98679
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/pt_BR/
2020-08-06 03:42:54 +00:00
@a2sc:matrix.org
8ef97e9dc6
Translated using Weblate (German)
...
Currently translated at 99.1% (233 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/de/
2020-08-06 03:42:33 +00:00
aWeinzierl
dedc183e75
Translated using Weblate (German)
...
Currently translated at 99.1% (233 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/de/
2020-08-06 03:42:33 +00:00
Priit Jõerüüt
199e3165f2
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/et/
2020-08-06 03:42:31 +00:00
Jeff Huang
ac86a8948e
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/zh_Hant/
2020-08-06 03:42:21 +00:00
linsui
a708a93f3e
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 74.5% (175 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/zh_Hans/
2020-08-06 03:42:13 +00:00
Benoit Marty
8cc12fb8d4
Only one token per request is possible so use header
instead of addHeader
2020-08-03 17:33:24 +02:00
Benoit Marty
4cbb2f7d9d
Cleanup
2020-08-03 17:33:24 +02:00
Benoit Marty
18c0f53764
Format
2020-08-03 17:33:24 +02:00
Valere
562cfce9e2
Support HS admin option to disable E2EE for DMs
...
Fixes #1794
2020-07-30 12:08:30 +02:00
Valere
5c32c7388a
cleaning
2020-07-29 09:51:50 +02:00
Valere
cbf43ea7b3
Session store migration
2020-07-29 09:50:12 +02:00
Valere
a47ff99be7
Merge branch 'develop' into feature/fix_reply_tag
2020-07-28 16:58:00 +02:00
ganfra
5176a3e2aa
Merge branch 'develop' into feature/fix_timeline_loading
2020-07-28 16:30:34 +02:00
Valere
12e2a8ffc8
Allow call in all 2 participants rooms
2020-07-28 14:43:50 +02:00
ganfra
833f64fcec
Fix timeline non loading when there are lots of filtered events
2020-07-28 11:49:45 +02:00
ganfra
da06695ab7
Relation content should be checked in encrypted content and not the decrypted one
2020-07-24 18:31:01 +02:00
ganfra
d7b44ba0cf
Merge branch 'develop' into feature/fix_reply_tag
2020-07-24 11:32:59 +02:00
ganfra
794b89c041
Reply: remove inner tags when replying
2020-07-23 18:23:49 +02:00
ganfra
cac8099117
Local echo: use missing updateSendingInformation on RoomSummaryUpdater
2020-07-23 16:38:17 +02:00
ganfra
aa5ae45a0c
Add hasFailedSending in RoomSummary and a small warning icon on room list
2020-07-22 15:21:48 +02:00
ganfra
d7558902f7
Sending: limit to 3 retry before failing
2020-07-22 11:12:37 +02:00
ganfra
e5596f6a97
Use Any instead of JsonDict so users won't loose ignored users
2020-07-21 10:43:52 +02:00
ganfra
fb247f8bea
Update CHANGES and clean code
2020-07-20 20:29:52 +02:00
ganfra
c880e2b848
Fix Requesting avatar thumbnails in Element uses wrong http "user-agent" string #1725
2020-07-20 20:24:04 +02:00
ganfra
1436477a14
Rework a bit user account data (and avoid blocking syncs)
2020-07-20 19:52:24 +02:00
ganfra
a488e88f93
Add reaction to RoomSummary latest previewable event
2020-07-20 16:49:05 +02:00
ganfra
0d51c160eb
Should fix realm crash loop
2020-07-20 16:43:39 +02:00
ganfra
27207a27ae
Fix "uploads don't work with Room v6" #1558
2020-07-17 20:33:47 +02:00
Benoit Marty
0f9e26efc5
let instead of also
2020-07-15 14:33:01 +02:00
Onuray Sahin
797dcdb48b
Merge branch 'riotx_develop' into rebranding_rebase
...
* riotx_develop: (111 commits)
Video calls are shown as a voice ones in the timeline (Fixes #1676 )
Fix regression: not able to create a room without IS configured (Fixes #1679 )
Fix / view attachment crash + freeze when offline
Version++
Prepare release 0.91.5
Fix test compilation issue
Fix crash after rebase
Add TODO
Copy Javadoc to the API class
Move internal methods to internal task
Latest renaming
Rename CreateRoomParamsInternalBuilder to CreateRoomBodyBuilder for clarity
Rename CreateRoomParamsBuilder to CreateRoomParams for clarity
Rename internal class
Expose other objects in the builder to create a room
ktlint
Display threePid invite along with the other invite (code is a bit dirty)
Hide right arrow if threepid invite can not be revoked
Disable fetching Msisdn, it does not work
Revoke ThreePid invitation (#548 )
...
# Conflicts:
# vector/build.gradle
# vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
# vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
# vector/src/main/res/values/strings.xml
2020-07-13 19:59:20 +03:00
Benoit Marty
0e28214b63
Do not display the name change popup for a new installation
2020-07-13 14:23:06 +02:00
Benoit Marty
6a4d887941
Merge branch 'develop' into feature/other_fixes
2020-07-13 11:31:25 +02:00
Benoit Marty
139cd051ab
Video calls are shown as a voice ones in the timeline ( Fixes #1676 )
2020-07-13 10:57:52 +02:00
Benoit Marty
33b2abc3b9
Fix regression: not able to create a room without IS configured ( Fixes #1679 )
2020-07-13 10:46:51 +02:00
Benoit Marty
ece9fbd3bb
Add TODO
2020-07-11 22:26:21 +02:00
Benoit Marty
602d67155f
Copy Javadoc to the API class
2020-07-11 22:25:21 +02:00
Benoit Marty
75ef491e3e
Move internal methods to internal task
2020-07-11 22:22:21 +02:00
Benoit Marty
0f327fc75f
Latest renaming
2020-07-11 22:17:55 +02:00
Benoit Marty
a456f4c6a5
Rename CreateRoomParamsInternalBuilder to CreateRoomBodyBuilder for clarity
2020-07-11 22:16:35 +02:00
Benoit Marty
e097bd8117
Rename CreateRoomParamsBuilder to CreateRoomParams for clarity
2020-07-11 22:15:26 +02:00
Benoit Marty
ded8acc836
Rename internal class
2020-07-11 22:13:22 +02:00
Benoit Marty
d8a0a1d38e
Expose other objects in the builder to create a room
2020-07-11 22:11:15 +02:00
Benoit Marty
e8f28d7ce4
ktlint
2020-07-11 22:11:15 +02:00
Benoit Marty
4b3a6a883d
CreateRoomParams has been replaced by CreateRoomParamsBuilder, to be able to invite 3pids
2020-07-11 22:10:52 +02:00
Benoit Marty
6c0bb2a949
Add 3Pid to the list. Not compiling, I have to modify CreateRoomParam
2020-07-11 22:08:02 +02:00
Benoit Marty
3842ec6bb0
Invite by msisdn. Error 500 from matrix.org though ( #548 )
2020-07-11 22:07:14 +02:00
Benoit Marty
ab1d652f17
Invite by email (msisdn not working), command line ( #548 )
2020-07-11 22:07:14 +02:00
Benoit Marty
70e90d8542
Render third party invite event ( #548 )
2020-07-11 22:07:14 +02:00
Benoit Marty
37378ca5a6
typo
2020-07-11 21:57:45 +02:00
Benoit Marty
a35749964c
Merge branch 'develop' into feature/fix_small_issues
2020-07-11 21:56:07 +02:00
ganfra
c2cccd8b11
Some changes after benoit's review
2020-07-11 15:26:54 +02:00
ganfra
e7804af2f7
EventInsertLiveObserver: change of delete method (should be faster)
2020-07-11 13:27:49 +02:00
ganfra
0412fabbd2
Clean comment on EventInsertLiveProcessor
2020-07-11 13:24:32 +02:00
Benoit Marty
6f4ea83fa9
Create allKnown() fun
2020-07-11 13:03:53 +02:00
ganfra
1c17bd9f5a
Clean code
2020-07-11 12:57:49 +02:00
ganfra
2f0645a94e
Fix left user has no name in db
2020-07-11 12:39:41 +02:00
Valere
c57d41863f
4S settings screen
2020-07-11 12:37:18 +02:00
ganfra
3fc9fe3017
Merge branch 'develop' into feature/fix_small_issues
2020-07-10 20:13:47 +02:00
ganfra
e07a584d66
Revert fixing users as it's not the good catch
2020-07-10 20:09:30 +02:00
ganfra
150d44aafd
Improve a bit how joining/leaving are handled
2020-07-10 20:08:51 +02:00
Benoit Marty
4741169cc7
Merge pull request #1611 from vector-im/feature/okhttp_for_glide
...
Feature/okhttp for glide
2020-07-10 15:54:31 +02:00
Benoit Marty
a8ad57a9b0
Merge pull request #1648 from vector-im/feature/server_recovery_banner
...
Feature/server recovery banner
2020-07-10 15:53:58 +02:00
Valere
8582ad6015
Merge pull request #1636 from vector-im/feature/attachement_pager
...
Feature/attachement pager
2020-07-10 15:47:32 +02:00
Benoit Marty
f179fc523d
Give configured OkHttpClient to Glide and BigImageViewer
2020-07-10 14:43:07 +02:00
Benoit Marty
6569ee5d10
Use Set instead of List
2020-07-10 14:42:30 +02:00
Benoit Marty
10f8aebde2
Update comment
2020-07-10 14:42:30 +02:00
Benoit Marty
28869f4382
Small cleanup before merge
2020-07-10 12:19:25 +02:00
ganfra
9c595b6c02
Fix "Leave room only leaves the current version"
2020-07-10 08:54:41 +02:00
ganfra
d49d0295a2
Send verification request when the device is not new
2020-07-09 18:31:09 +02:00
ganfra
548879bd9f
Fix encryption enabling visible for all users
2020-07-09 17:20:51 +02:00
Valere
332f227bc1
Signout to setup 4S
2020-07-09 15:45:58 +02:00