~singpolyma/cheogram-android

Revert stuff that needs newer libwebrtc
Merge branch 'fix-contact-sync'

* fix-contact-sync:
  Contact sync needs to happen when we discover a new gateway
  Skip contact sync work if there are no gateways configured
Merge branch 'master' of github.com:iNPUTmice/Conversations

* 'master' of github.com:iNPUTmice/Conversations:
  bump agp
  version bump to 2.10.6
  pulled translations from transifex
  do not merge failed decryptions
  version bump firebasse-messaging lib
Contact sync needs to happen when we discover a new gateway

Since that can change the outcome of the sync operation.
Skip contact sync work if there are no gateways configured

Or if syncing before gateways have been discovered, etc.  Don't do the work if
we know nothing will come of it.
Merge branch 'darker'

* darker:
  Darker Obsidian
Merge branch '3GPP-video'

* 3GPP-video:
  Move video MIME above audio MIME
Move video MIME above audio MIME

So that when a file extension is ambiguous, we guess video.
d5ac6e35 — Daniel Gultsch a month ago
bump agp
d1dcc577 — Daniel Gultsch 2 months ago
version bump to 2.10.6
86bb3df8 — Daniel Gultsch 2 months ago
pulled translations from transifex
85f06f1c — Daniel Gultsch 2 months ago
do not merge failed decryptions

fixes #4314
Merge branch 'master' of github.com:iNPUTmice/Conversations

* 'master' of github.com:iNPUTmice/Conversations:
  pulled translations from transifex
  Revert "flush stanzas in batches"
  fix NPE during bookmark creation
  bump agp
  null check axolotl service when getting trust
  check domain name against DNSName to avoid rare crashes
  work around platform bug when getting restrict background
  pulled translations from transifex
Merge branch 'peter-dev' of https://gitea.angry.im/PeterCxy/cheogram

* 'peter-dev' of https://gitea.angry.im/PeterCxy/cheogram:
  Call setActive anyway in CONNECTED state
  Add @RequiresApi annotation for dialer integration
  Use StatusHint label to signal connecting state
  set in-call UI active in the connecting state
Call setActive anyway in CONNECTED state

There is no code that guarantees the state must go through CONNECTING
before being CONNECTED. To avoid potential bugs, call setActive anyway
here.
Add @RequiresApi annotation for dialer integration

to stop the linter complaining every second line of code
Next