Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] restrict checkout-close on WebView error to network errors

r4khul0e4eb7408314
diff --git a/mobile/apps/photos/lib/ui/payment/payment_web_page.dart b/mobile/apps/photos/lib/ui/payment/payment_web_page.dart
index ca55e613f1..f72d35b338 100644
--- a/mobile/apps/photos/lib/ui/payment/payment_web_page.dart
+++ b/mobile/apps/photos/lib/ui/payment/payment_web_page.dart
@@ -98,8 +98,17 @@ class _PaymentWebPageState extends State<PaymentWebPage> {
},
onReceivedError: (controller, navigationAction, error) async {
_logger.severe("onLoadError $navigationAction $error");
+ final networkErrorTypes = {
+ WebResourceErrorType.HOST_LOOKUP,
+ WebResourceErrorType.NOT_CONNECTED_TO_INTERNET,
+ WebResourceErrorType.NETWORK_CONNECTION_LOST,
+ WebResourceErrorType.TIMEOUT,
+ WebResourceErrorType.CANNOT_CONNECT_TO_HOST,
+ WebResourceErrorType.SERVER_UNREACHABLE,
+ };
+ final isNetworkError = networkErrorTypes.contains(error.type);
if (navigationAction.isForMainFrame == true &&
- error.type != WebResourceErrorType.CANCELLED) {
+ isNetworkError) {
if (!mounted) return;
final navigator = Navigator.of(context);
navigator.pop(false);
diff --git a/mobile/apps/photos/lib/utils/dialog_util.dart b/mobile/apps/photos/lib/utils/dialog_util.dart
index 401ebd4125..902f0016a9 100644
--- a/mobile/apps/photos/lib/utils/dialog_util.dart
+++ b/mobile/apps/photos/lib/utils/dialog_util.dart
@@ -130,6 +130,7 @@ String parseErrorForUI(
if (error is WebResourceError) {
if (error.type == WebResourceErrorType.HOST_LOOKUP ||
error.type == WebResourceErrorType.NOT_CONNECTED_TO_INTERNET ||
+ error.type == WebResourceErrorType.NETWORK_CONNECTION_LOST ||
error.type == WebResourceErrorType.TIMEOUT) {
return context.strings.networkHostLookUpErr;
} else if (error.type == WebResourceErrorType.CANNOT_CONNECT_TO_HOST ||