* 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
* develop: (123 commits)
Fixes#1647 share not working
Put xmx to 2048m
Update changelog after PR merged
Version++
Prepare release 0.91.04-beta
Add the new value to the ViewEvent, because the state is maybe not up to date.
Fix lint error, following the upgrade of the libs
Revert to gradle build 3.5.3
Clean code
Fix leaving selected group
QuickFix / crash when starting in airplane mode
Group: rework a bit how and when we fetch data about groups
EventInsert: add InsertType to avoid trying to process events we shouldn't
Upload device keys only once to the homeserver and fix crash when no network (#1629)
Upgrade some dependencies
Add a delay to avoid crash. Sounds like a workaround...
Handle certificate error in case of Direct Login
Handle JobCancellationException
Simplify the server selection screen: remove the "Continue" button
Re-activate Wellknown support with updated UI (#1614)
...
# Conflicts:
# vector/build.gradle
# vector/src/main/res/values/strings.xml
SpiritCroc
Benoit Marty
Onuray Sahin
ganfra
Valere