Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][photos] handle referral and Cast load errors

r4khul4490a87536c2
diff --git a/mobile/apps/photos/lib/ui/growth/referral_screen.dart b/mobile/apps/photos/lib/ui/growth/referral_screen.dart
index f607e237e8..bb7f86cd96 100644
--- a/mobile/apps/photos/lib/ui/growth/referral_screen.dart
+++ b/mobile/apps/photos/lib/ui/growth/referral_screen.dart
@@ -11,24 +11,39 @@ import "package:photos/ui/common/web_page.dart";
import "package:photos/ui/growth/apply_code_sheet.dart";
import "package:photos/ui/growth/referral_code_widget.dart";
import "package:photos/ui/growth/storage_details_screen.dart";
+import "package:photos/utils/dialog_util.dart";
import "package:photos/utils/share_util.dart";
import "package:tuple/tuple.dart";
class ReferralScreen extends StatefulWidget {
- const ReferralScreen({super.key});
+ const ReferralScreen({this.initialData, super.key});
- @override
- State<ReferralScreen> createState() => _ReferralScreenState();
-}
+ final Tuple2<ReferralView, UserDetails>? initialData;
-class _ReferralScreenState extends State<ReferralScreen> {
- void _safeUIUpdate() {
- if (mounted) {
- setState(() {});
+ static Future<void> open(
+ BuildContext context, {
+ bool showLoadingDialog = false,
+ }) async {
+ final dialog = showLoadingDialog
+ ? createProgressDialog(context, context.strings.pleaseWait)
+ : null;
+ if (dialog != null) await dialog.show();
+
+ late final Tuple2<ReferralView, UserDetails> data;
+ try {
+ data = await _fetchData();
+ } catch (error) {
+ if (dialog != null) await dialog.hide();
+ if (!context.mounted) return;
+ await showGenericErrorDialog(context: context, error: error);
+ return;
}
+ if (dialog != null) await dialog.hide();
+ if (!context.mounted) return;
+ await routeToPage(context, ReferralScreen(initialData: data));
}
- Future<Tuple2<ReferralView, UserDetails>> _fetchData() async {
+ static Future<Tuple2<ReferralView, UserDetails>> _fetchData() async {
UserDetails? cachedUserDetails = UserService.instance
.getCachedUserDetails();
cachedUserDetails ??= await UserService.instance.getUserDetailsV2(
@@ -38,11 +53,38 @@ class _ReferralScreenState extends State<ReferralScreen> {
return Tuple2(referralView, cachedUserDetails);
}
+ @override
+ State<ReferralScreen> createState() => _ReferralScreenState();
+}
+
+class _ReferralScreenState extends State<ReferralScreen> {
+ late Future<Tuple2<ReferralView, UserDetails>> _dataFuture;
+ Tuple2<ReferralView, UserDetails>? _initialData;
+
+ @override
+ void initState() {
+ super.initState();
+ _initialData = widget.initialData;
+ _dataFuture = widget.initialData == null
+ ? ReferralScreen._fetchData()
+ : Future.value(widget.initialData!);
+ }
+
+ void _safeUIUpdate() {
+ if (mounted) {
+ setState(() {
+ _initialData = null;
+ _dataFuture = ReferralScreen._fetchData();
+ });
+ }
+ }
+
@override
Widget build(BuildContext context) {
final l10n = context.strings;
return FutureBuilder<Tuple2<ReferralView, UserDetails>>(
- future: _fetchData(),
+ future: _dataFuture,
+ initialData: _initialData,
builder: (context, snapshot) {
if (snapshot.hasData) {
return SettingsPageScaffold(
diff --git a/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart b/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart
index 6875eb034e..fec6352126 100644
--- a/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart
@@ -1,9 +1,9 @@
import "dart:math";
import "package:ente_components/ente_components.dart";
+import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
import "package:ente_ui/components/loading_widget.dart";
-import "package:ente_ui/utils/dialog_util.dart";
import "package:flutter/material.dart";
import "package:hugeicons/hugeicons.dart";
import "package:logging/logging.dart";
@@ -12,10 +12,28 @@ import "package:photos/gateways/cast/cast_gateway.dart";
import "package:photos/service_locator.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/theme/ente_theme.dart";
+import "package:photos/utils/dialog_util.dart";
import "package:photos/utils/relative_time_formatter.dart";
class CastSettingsPage extends StatelessWidget {
- const CastSettingsPage({super.key});
+ const CastSettingsPage({required this.initialSessions, super.key});
+
+ final List<CastInfo> initialSessions;
+
+ static Future<void> open(BuildContext context) async {
+ late final List<CastInfo> sessions;
+ try {
+ sessions = await CastGateway(
+ NetworkClient.instance.enteDio,
+ ).getAllCastSessions();
+ } catch (error) {
+ if (!context.mounted) return;
+ await showGenericErrorDialog(context: context, error: error);
+ return;
+ }
+ if (!context.mounted) return;
+ await routeToPage(context, CastSettingsPage(initialSessions: sessions));
+ }
@override
Widget build(BuildContext context) {
@@ -26,6 +44,7 @@ class CastSettingsPage extends StatelessWidget {
children: [
CastSessionsList(
showTitle: false,
+ initialSessions: initialSessions,
fallback: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
@@ -86,7 +105,20 @@ class _CastSessionsListState extends State<CastSessionsList> {
return const Center(child: EnteLoadingWidget());
}
if (snapshot.hasError) {
- throw snapshot.error!;
+ logger.severe(
+ "Failed to load Cast sessions",
+ snapshot.error,
+ snapshot.stackTrace,
+ );
+ return Padding(
+ padding: const EdgeInsets.symmetric(vertical: 80),
+ child: Center(
+ child: Text(
+ l10n.oopsSomethingWentWrong,
+ style: TextStyles.body.copyWith(color: colors.textLight),
+ ),
+ ),
+ );
}
if (!snapshot.hasData || snapshot.data == null) {
logger.severe("No data returned by get all cast sessions.");
diff --git a/mobile/apps/photos/lib/ui/settings/debug/debug_settings_page.dart b/mobile/apps/photos/lib/ui/settings/debug/debug_settings_page.dart
index 817463667d..7d9748e296 100644
--- a/mobile/apps/photos/lib/ui/settings/debug/debug_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/debug/debug_settings_page.dart
@@ -1,5 +1,4 @@
import "package:ente_components/ente_components.dart";
-import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:flutter/material.dart";
import "package:hugeicons/hugeicons.dart";
import "package:photos/core/event_bus.dart";
@@ -206,9 +205,9 @@ class _DebugSettingsPageState extends State<DebugSettingsPage> {
action != ChangeLogPageAction.openReferrals) {
return;
}
- await routeToPage(
+ await ReferralScreen.open(
context,
- const ReferralScreen(),
+ showLoadingDialog: true,
);
},
),
diff --git a/mobile/apps/photos/lib/ui/settings_page.dart b/mobile/apps/photos/lib/ui/settings_page.dart
index 01c79e1b86..684db09adf 100644
--- a/mobile/apps/photos/lib/ui/settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings_page.dart
@@ -359,8 +359,9 @@ class _SettingsBody extends StatelessWidget {
_buildMenuItem(
title: context.strings.referrals,
icon: HugeIcons.strokeRoundedTicketStar,
+ showOnlyLoadingState: true,
onTap: () async {
- await routeToPage(context, const ReferralScreen());
+ await ReferralScreen.open(context);
},
),
],
@@ -417,8 +418,9 @@ class _SettingsBody extends StatelessWidget {
_buildMenuItem(
title: context.strings.castSessions,
icon: HugeIcons.strokeRoundedTvSmart,
+ showOnlyLoadingState: true,
onTap: () async {
- await routeToPage(context, const CastSettingsPage());
+ await CastSettingsPage.open(context);
},
),
_buildMapsMenuItem(context),
diff --git a/mobile/apps/photos/lib/ui/tabs/home_widget.dart b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
index 8d8a6fc33f..ac9d96ee85 100644
--- a/mobile/apps/photos/lib/ui/tabs/home_widget.dart
+++ b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
@@ -1251,7 +1251,7 @@ class _HomeWidgetState extends State<HomeWidget> {
}
if (sheetAction == ChangeLogPageAction.openReferrals) {
if (!context.mounted) return;
- await routeToPage(context, const ReferralScreen());
+ await ReferralScreen.open(context, showLoadingDialog: true);
}
} finally {
_isShowingChangeLog = false;