fix: Multiple problems with SSO
This commit is contained in:
parent
ed30991e56
commit
94013fb2c6
3 changed files with 9 additions and 4 deletions
|
|
@ -38,7 +38,7 @@
|
|||
>
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:launchMode="singleInstance"
|
||||
android:launchMode="singleTask"
|
||||
android:theme="@style/LaunchTheme"
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
|
||||
android:hardwareAccelerated="true"
|
||||
|
|
|
|||
|
|
@ -801,7 +801,13 @@ class ChatListController extends State<ChatList>
|
|||
await client.accountDataLoading;
|
||||
await client.userDeviceKeysLoading;
|
||||
if (client.prevBatch == null) {
|
||||
await client.onSync.stream.first;
|
||||
await client.onSyncStatus.stream
|
||||
.firstWhere((status) => status.status == SyncStatus.finished);
|
||||
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
waitForFirstSync = true;
|
||||
});
|
||||
|
||||
// Display first login bootstrap if enabled
|
||||
if (client.encryption?.keyManager.enabled == true) {
|
||||
|
|
|
|||
|
|
@ -166,8 +166,7 @@ class HomeserverPickerController extends State<HomeserverPicker> {
|
|||
isLoading = true;
|
||||
});
|
||||
try {
|
||||
final client = await Matrix.of(context).getLoginClient();
|
||||
client.login(
|
||||
await client.login(
|
||||
LoginType.mLoginToken,
|
||||
token: token,
|
||||
initialDeviceDisplayName: PlatformInfos.clientName,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue