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.

Darker Obsidian

Fix NPE

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

Use StatusHint label to signal connecting state

set in-call UI active in the connecting state

Currently, if the "CONNECTING" stage of a Jingle call takes a
significant amount of time (say, a second), then there will be a window
where the call is already accepted but the ringing UI is still showing.
This 1) is confusing; 2) allows the user to accept a call twice, which
will cause a crash.

Unfortunately, there is no native equivalent to the "CONNECTING" state.
The only sane choice here seems to be showing the in-call UI even if the
call is still connecting.

pulled translations from transifex

Revert "flush stanzas in batches"

This reverts commit 6bd552f6a32ca93826cb491f9b4bd757f9698227.

fixes #4313

This turned out to be a rather unnecessary optimization that might cause
problems with wake locks (the app is no longer awake after the 400ms timeout)

fix NPE during bookmark creation

closes #4312

fixes #4211

thank you @singpolyma

Fix NPE

Make Sopranica bookmark deleteable.

Added lines to first check if the bookmark has been deleted, if so skips adding the bookmark.

Use theme colour for notifications

Add Obsidian theme

Remove all PhoneAccount when an Account is removed

Check for gateway/pstn after caps has been fetched

Previously we would check for the identity at contact presence change,
but the first time the contact comes online (say, during onboarding or
first app use) the contact has never had service discovery done and so
the identity is not known.  Move the identity check to after the service
discovery has certainly been done in order to be sure it works first
time.