~singpolyma/cheogram-android

Merge branch 'sms-import' of git.sr.ht:~hdasch/cheogram-android into sms-import

* 'sms-import' of git.sr.ht:~hdasch/cheogram-android:
  Import SMS messages: launch ImportSmsActivity.
  Import SMS messages: importer implementation.
  Import SMS messages: define UI resources.
List XEP-0224 in doap
Basic support for sending attention with @here prefix
Notify on attention messages from MUC member or higher
Use startForegroundService directly

We already verified we are on a version that supports it.
Include link to app privacy policy in welcome flow
Fix possible ConcurrentModificationException
Don't call task.run() twice

Looks like merge error
Set default audio device based on dialler selected route
Move lock out of bar

And clear history into more options
Welcome screen intro slideshow
Merge branch 'inversion'

* inversion:
  Don't jump straight in, since the conversation list is safe now
  Never show setup dialogs during onboarding
  Try to get list of commands for any domain jid
  Hide cancel button when onboarding
  When entering cheogram.com conversation while onboarding, go to register
  Hide menu and fab when onboarding
  Use the JID from the link
  Never show tabs in onboarding mode
  This doesn't even work, because we never treat cheogram.com as a stranger
  If onboarding and just cheogram.com conversation open, switch into command flow
  When starting command, wait for account to connect
  Switch to existing session when there is one, for incoming intent
  Start onboarding where we left off
  Fix NPE
  Fix NPE
  Allow cancel onboarding
  Inverted flow happy path
  If a command response indicates an XMPP URI, jump to that
  Make sure UI update happens even if the View was not attached when the iq came in
Don't jump straight in, since the conversation list is safe now

And don't switch unconditionally, since we want you to be able to start a new
flow from a link/button even if you still have the last page open from before.
Never show setup dialogs during onboarding
Try to get list of commands for any domain jid
Hide cancel button when onboarding

Sort so that cancel comes before prev comes before everything else
When entering cheogram.com conversation while onboarding, go to register
Hide menu and fab when onboarding
Use the JID from the link

Which may contain a resource
Next