don't require login for UP controller to finish init
This commit is contained in:
parent
f4142859ba
commit
f910d87a23
2 changed files with 47 additions and 56 deletions
|
|
@ -119,11 +119,8 @@ class UnifiedPushController extends AsyncNotifier<bool> {
|
||||||
Future<void> register([bool alreadyRegistered = false]) async {
|
Future<void> register([bool alreadyRegistered = false]) async {
|
||||||
state = .loading();
|
state = .loading();
|
||||||
try {
|
try {
|
||||||
final clientStateProvider = ClientStateController.provider;
|
final clientState = ref.watch(ClientStateController.provider);
|
||||||
while (ref.read(clientStateProvider)?.deviceId == null) {
|
if (clientState?.deviceId == null) return;
|
||||||
await Future.delayed(.new(milliseconds: 250));
|
|
||||||
}
|
|
||||||
final clientState = ref.read(clientStateProvider);
|
|
||||||
|
|
||||||
final capabilities = await ref
|
final capabilities = await ref
|
||||||
.read(ClientController.provider.notifier)
|
.read(ClientController.provider.notifier)
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ import "package:nexus/controllers/multi_provider.dart";
|
||||||
import "package:nexus/controllers/notification.dart";
|
import "package:nexus/controllers/notification.dart";
|
||||||
import "package:nexus/controllers/settings.dart";
|
import "package:nexus/controllers/settings.dart";
|
||||||
import "package:nexus/controllers/unified_push.dart";
|
import "package:nexus/controllers/unified_push.dart";
|
||||||
import "package:nexus/helpers/extensions/better_when.dart";
|
|
||||||
import "package:nexus/helpers/extensions/scheme_to_theme.dart";
|
import "package:nexus/helpers/extensions/scheme_to_theme.dart";
|
||||||
import "package:nexus/helpers/font_licenses.dart";
|
import "package:nexus/helpers/font_licenses.dart";
|
||||||
import "package:nexus/pages/chat.dart";
|
import "package:nexus/pages/chat.dart";
|
||||||
|
|
@ -150,12 +149,10 @@ class const App({super.key}) extends StatelessWidget {
|
||||||
),
|
),
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
body: Consumer(
|
body: Consumer(
|
||||||
builder: (_, ref, _) => ref
|
builder: (_, ref, _) => switch (ref.watch(
|
||||||
.watch(ClientController.provider)
|
|
||||||
.betterWhen(
|
|
||||||
data: (_) => switch (ref.watch(
|
|
||||||
MultiProviderController.provider(
|
MultiProviderController.provider(
|
||||||
.new([
|
.new([
|
||||||
|
ClientController.provider,
|
||||||
NotificationController.provider,
|
NotificationController.provider,
|
||||||
UnifiedPushController.provider,
|
UnifiedPushController.provider,
|
||||||
MemberListOpenedController.provider,
|
MemberListOpenedController.provider,
|
||||||
|
|
@ -166,9 +163,7 @@ class const App({super.key}) extends StatelessWidget {
|
||||||
)) {
|
)) {
|
||||||
AsyncData(value: _) || AsyncLoading(value: _?) => Consumer(
|
AsyncData(value: _) || AsyncLoading(value: _?) => Consumer(
|
||||||
builder: (_, ref, _) {
|
builder: (_, ref, _) {
|
||||||
final clientState = ref.watch(
|
final clientState = ref.watch(ClientStateController.provider);
|
||||||
ClientStateController.provider,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (clientState == null || !clientState.isInitialized) {
|
if (clientState == null || !clientState.isInitialized) {
|
||||||
return Loading();
|
return Loading();
|
||||||
|
|
@ -206,6 +201,5 @@ class const App({super.key}) extends StatelessWidget {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue