2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Multiple problems with SSO

Browse source
This commit is contained in:
Christian Kußowski 2025-06-20 09:22:09 +02:00
commit 94013fb2c6
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/app/src/main/AndroidManifest.xml
View file

@ -38,7 +38,7 @@
> >
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:launchMode="singleInstance" android:launchMode="singleTask"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"

8
lib/pages/chat_list/chat_list.dart
View file

@ -801,7 +801,13 @@ class ChatListController extends State<ChatList>
await client.accountDataLoading; await client.accountDataLoading;
await client.userDeviceKeysLoading; await client.userDeviceKeysLoading;
if (client.prevBatch == null) { 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 // Display first login bootstrap if enabled
if (client.encryption?.keyManager.enabled == true) { if (client.encryption?.keyManager.enabled == true) {

3
lib/pages/homeserver_picker/homeserver_picker.dart
View file

@ -166,8 +166,7 @@ class HomeserverPickerController extends State<HomeserverPicker> {
isLoading = true; isLoading = true;
}); });
try { try {
final client = await Matrix.of(context).getLoginClient(); await client.login(
client.login(
LoginType.mLoginToken, LoginType.mLoginToken,
token: token, token: token,
initialDeviceDisplayName: PlatformInfos.clientName, initialDeviceDisplayName: PlatformInfos.clientName,