fix: Better profile caching in settings

This commit is contained in:
Christian Pauly 2021-05-31 20:58:20 +02:00
parent 4e7cd9bf46
commit e6f3f0bb5e

View File

@ -34,6 +34,12 @@ class SettingsController extends State<Settings> {
bool crossSigningCached; bool crossSigningCached;
Future<bool> megolmBackupCachedFuture; Future<bool> megolmBackupCachedFuture;
bool megolmBackupCached; bool megolmBackupCached;
bool profileUpdated = false;
void updateProfile() => setState(() {
profileUpdated = true;
profile = profileFuture = null;
});
void logoutAction() async { void logoutAction() async {
if (await showOkCancelAlertDialog( if (await showOkCancelAlertDialog(
@ -186,30 +192,29 @@ class SettingsController extends State<Settings> {
matrix.client.setDisplayName(matrix.client.userID, input.single), matrix.client.setDisplayName(matrix.client.userID, input.single),
); );
if (success.error == null) { if (success.error == null) {
setState(() { updateProfile();
profileFuture = null;
profile = null;
});
} }
} }
void setAvatarAction() async { void setAvatarAction() async {
final action = await showConfirmationDialog<AvatarAction>( final action = profile?.avatar == null
context: context, ? AvatarAction.change
title: L10n.of(context).pleaseChoose, : await showConfirmationDialog<AvatarAction>(
actions: [ context: context,
AlertDialogAction( title: L10n.of(context).pleaseChoose,
key: AvatarAction.change, actions: [
label: L10n.of(context).changeYourAvatar, AlertDialogAction(
isDefaultAction: true, key: AvatarAction.change,
), label: L10n.of(context).changeYourAvatar,
AlertDialogAction( isDefaultAction: true,
key: AvatarAction.remove, ),
label: L10n.of(context).removeYourAvatar, AlertDialogAction(
isDestructiveAction: true, key: AvatarAction.remove,
), label: L10n.of(context).removeYourAvatar,
], isDestructiveAction: true,
); ),
],
);
if (action == null) return; if (action == null) return;
final matrix = Matrix.of(context); final matrix = Matrix.of(context);
if (action == AvatarAction.remove) { if (action == AvatarAction.remove) {
@ -218,10 +223,7 @@ class SettingsController extends State<Settings> {
future: () => matrix.client.setAvatarUrl(matrix.client.userID, null), future: () => matrix.client.setAvatarUrl(matrix.client.userID, null),
); );
if (success.error == null) { if (success.error == null) {
setState(() { updateProfile();
profileFuture = null;
profile = null;
});
} }
return; return;
} }
@ -251,10 +253,7 @@ class SettingsController extends State<Settings> {
future: () => matrix.client.setAvatar(file), future: () => matrix.client.setAvatar(file),
); );
if (success.error == null) { if (success.error == null) {
setState(() { updateProfile();
profileFuture = null;
profile = null;
});
} }
} }
@ -391,8 +390,8 @@ class SettingsController extends State<Settings> {
profileFuture ??= client profileFuture ??= client
.getProfileFromUserId( .getProfileFromUserId(
client.userID, client.userID,
cache: false, cache: !profileUpdated,
getFromRooms: false, getFromRooms: !profileUpdated,
) )
.then((p) { .then((p) {
if (mounted) setState(() => profile = p); if (mounted) setState(() => profile = p);