kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-08 07:28:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[auth] Show contact support button on error dialogs

Browse Source
This commit is contained in:
Neeraj Gupta 2024-06-21 12:08:26 +05:30
parent 1e83ef0c06
commit 29539d9db2
11 changed files with 115 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/lib/l10n/arb/app_en.arb
View File

@ -263,6 +263,8 @@
"exportLogs": "Export logs",
"enterYourRecoveryKey": "Enter your recovery key",
"tempErrorContactSupportIfPersists": "It looks like something went wrong. Please retry after some time. If the error persists, please contact our support team.",
"networkHostLookUpErr": "Unable to connect to Ente, please check your network settings and contact support if the error persists.",
"networkConnectionRefusedErr": "Unable to connect to Ente, please retry after sometime. If the error persists, please contact support.",
"itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "It looks like something went wrong. Please retry after some time. If the error persists, please contact our support team.",
"about": "About",
"weAreOpenSource": "We are open source!",

2
auth/lib/services/passkey_service.dart
View File

@ -49,7 +49,7 @@ class PasskeyService {
);
} catch (e) {
Logger('PasskeyService').severe("failed to open passkey page", e);
showGenericErrorDialog(context: context).ignore();
showGenericErrorDialog(context: context, error: e).ignore();
}
}
}

13
auth/lib/services/user_service.dart
View File

@ -101,7 +101,7 @@ class UserService {
);
return;
}
unawaited(showGenericErrorDialog(context: context));
unawaited(showGenericErrorDialog(context: context, error: null));
} on DioException catch (e) {
await dialog.hide();
_logger.info(e);
@ -114,12 +114,12 @@ class UserService {
),
);
} else {
unawaited(showGenericErrorDialog(context: context));
unawaited(showGenericErrorDialog(context: context, error: e));
}
} catch (e) {
await dialog.hide();
_logger.severe(e);
unawaited(showGenericErrorDialog(context: context));
unawaited(showGenericErrorDialog(context: context, error: e));
}
}
@ -227,7 +227,7 @@ class UserService {
//to close and only then to show the error dialog.
Future.delayed(
const Duration(milliseconds: 150),
() => showGenericErrorDialog(context: context),
() => showGenericErrorDialog(context: context, error: e),
);
rethrow;
}
@ -248,7 +248,10 @@ class UserService {
}
} catch (e) {
_logger.severe(e);
await showGenericErrorDialog(context: context);
await showGenericErrorDialog(
context: context,
error: e,
);
return null;
}
}

15
auth/lib/ui/account/password_entry_page.dart
View File

@ -412,7 +412,10 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
_logger.severe(e, s);
await dialog.hide();
// ignore: unawaited_futures
showGenericErrorDialog(context: context);
showGenericErrorDialog(
context: context,
error: e,
);
}
}
@ -472,7 +475,10 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
_logger.severe(e, s);
await dialog.hide();
// ignore: unawaited_futures
showGenericErrorDialog(context: context);
showGenericErrorDialog(
context: context,
error: e,
);
}
}
@ -500,7 +506,10 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
);
} else {
// ignore: unawaited_futures
showGenericErrorDialog(context: context);
showGenericErrorDialog(
context: context,
error: e,
);
}
}
}

10
auth/lib/ui/account/verify_recovery_page.dart
View File

@ -47,7 +47,10 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
"Please check your internet connection and try again.",
);
} else {
await showGenericErrorDialog(context: context);
await showGenericErrorDialog(
context: context,
error: e,
);
}
return;
}
@ -107,7 +110,10 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
);
} catch (e) {
// ignore: unawaited_futures
showGenericErrorDialog(context: context);
showGenericErrorDialog(
context: context,
error: e,
);
return;
}
}

5
auth/lib/ui/components/buttons/button_widget.dart
View File

@ -485,7 +485,10 @@ class _ButtonChildWidgetState extends State<ButtonChildWidget> {
} else if (exception != null) {
//This is to show the execution was unsuccessful if the dialog is manually
//closed before the execution completes.
showGenericErrorDialog(context: context);
showGenericErrorDialog(
context: context,
error: exception,
);
}
}

8
auth/lib/ui/home_page.dart
View File

@ -56,7 +56,8 @@ class _HomePageState extends State<HomePage> {
final scaffoldKey = GlobalKey<ScaffoldState>();
final TextEditingController _textController = TextEditingController();
final bool _autoFocusSearch = PreferenceService.instance.shouldAutoFocusOnSearchBar();
final bool _autoFocusSearch =
PreferenceService.instance.shouldAutoFocusOnSearchBar();
bool _showSearchBox = false;
String _searchText = "";
List<Code>? _allCodes;
@ -448,7 +449,10 @@ class _HomePageState extends State<HomePage> {
CodeStore.instance.addCode(newCode);
_focusNewCode(newCode);
} catch (e, s) {
showGenericErrorDialog(context: context);
showGenericErrorDialog(
context: context,
error: e,
);
_logger.severe("error while handling deeplink", e, s);
}
}

6
auth/lib/ui/passkey_page.dart
View File

@ -69,7 +69,7 @@ class _PasskeyPageState extends State<PasskeyPage> {
return;
} catch (e, s) {
_logger.severe("failed to check status", e, s);
showGenericErrorDialog(context: context).ignore();
showGenericErrorDialog(context: context, error: e).ignore();
return;
}
await UserService.instance.onPassKeyVerified(context, response);
@ -111,7 +111,7 @@ class _PasskeyPageState extends State<PasskeyPage> {
}
} catch (e, s) {
_logger.severe('passKey: failed to handle deeplink', e, s);
showGenericErrorDialog(context: context).ignore();
showGenericErrorDialog(context: context, error: e).ignore();
}
}
@ -169,7 +169,7 @@ class _PasskeyPageState extends State<PasskeyPage> {
await checkStatus();
} catch (e) {
debugPrint('failed to check status %e');
showGenericErrorDialog(context: context).ignore();
showGenericErrorDialog(context: context, error: e).ignore();
}
},
shouldSurfaceExecutionStates: true,

5
auth/lib/ui/settings/account_section_widget.dart
View File

@ -111,7 +111,10 @@ class AccountSectionWidget extends StatelessWidget {
CryptoUtil.bin2hex(Configuration.instance.getRecoveryKey());
} catch (e) {
// ignore: unawaited_futures
showGenericErrorDialog(context: context);
showGenericErrorDialog(
context: context,
error: e,
);
return;
}
// ignore: unawaited_futures

5
auth/lib/ui/settings/security_section_widget.dart
View File

@ -182,7 +182,10 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
PasskeyService.instance.openPasskeyPage(buildContext).ignore();
} catch (e, s) {
_logger.severe("failed to open passkey page", e, s);
await showGenericErrorDialog(context: context);
await showGenericErrorDialog(
context: context,
error: e,
);
}
}

64
auth/lib/utils/dialog_util.dart
View File

@ -14,6 +14,7 @@ import 'package:ente_auth/ui/components/dialog_widget.dart';
import 'package:ente_auth/ui/components/models/button_result.dart';
import 'package:ente_auth/ui/components/models/button_type.dart';
import 'package:ente_auth/utils/email_util.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
typedef DialogBuilder = DialogWidget Function(BuildContext context);
@ -70,16 +71,77 @@ Future<ButtonResult?> showErrorDialogForException({
);
}
String parseErrorForUI(
BuildContext context,
String genericError, {
Object? error,
bool surfaceError = kDebugMode,
}) {
try {
if (error == null) {
return genericError;
}
if (error is DioException) {
final DioException dioError = error;
if (dioError.type == DioExceptionType.unknown) {
if (dioError.error.toString().contains('Failed host lookup')) {
return context.l10n.networkHostLookUpErr;
} else if (dioError.error.toString().contains('SocketException')) {
return context.l10n.networkConnectionRefusedErr;
}
}
}
// return generic error if the user is not internal and the error is not in debug mode
if (!kDebugMode) {
return genericError;
}
String errorInfo = "";
if (error is DioException) {
final DioException dioError = error;
if (dioError.type == DioExceptionType.badResponse) {
if (dioError.response?.data["code"] != null) {
errorInfo = "Reason: " + dioError.response!.data["code"];
} else {
errorInfo = "Reason: " + dioError.response!.data.toString();
}
} else if (dioError.type == DioExceptionType.unknown) {
errorInfo = "Reason: " + dioError.error.toString();
} else {
errorInfo = "Reason: " + dioError.type.toString();
}
} else {
if (kDebugMode) {
errorInfo = error.toString();
} else {
errorInfo = error.toString().split('Source stack')[0];
}
}
if (errorInfo.isNotEmpty) {
return "$genericError\n\n$errorInfo";
}
return genericError;
} catch (e) {
return genericError;
}
}
///Will return null if dismissed by tapping outside
Future<ButtonResult?> showGenericErrorDialog({
required BuildContext context,
bool isDismissible = true,
required Object? error,
}) async {
final errorBody = parseErrorForUI(
context,
context.l10n.itLooksLikeSomethingWentWrongPleaseRetryAfterSome,
error: error,
);
return showDialogWidget(
context: context,
title: context.l10n.error,
icon: Icons.error_outline_outlined,
body: context.l10n.itLooksLikeSomethingWentWrongPleaseRetryAfterSome,
body: errorBody,
isDismissible: isDismissible,
buttons: [
ButtonWidget(