element-android/vector/src/main
Onuray Sahin 93fe00a299 Merge branch 'develop' into rebranding_rebase
* 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
2020-07-10 13:05:52 +03:00
..
assets Uniform emoji representation for all platform 2020-04-10 11:02:33 +02:00
java/im/vector/riotx Merge branch 'develop' into rebranding_rebase 2020-07-10 13:05:52 +03:00
res Merge branch 'develop' into rebranding_rebase 2020-07-10 13:05:52 +03:00
AndroidManifest.xml Merge branch 'develop' into rebranding_rebase 2020-07-10 13:05:52 +03:00