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

[auth] Surface more information about importError on UI

Browse Source
This commit is contained in:
Neeraj Gupta 2024-06-01 11:31:31 +05:30
parent 26cbc5a2f0
commit 1f33df7147
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth/lib/ui/settings/data/import/aegis_import.dart
View File

@ -76,7 +76,7 @@ Future<void> _pickAegisJsonFile(BuildContext context) async {
await showErrorDialog( await showErrorDialog(
context, context,
context.l10n.sorry, context.l10n.sorry,
context.l10n.importFailureDesc, "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
); );
} }
} }
@ -148,7 +148,7 @@ Future<int?> _processAegisExportFile(
otpUrl = otpUrl =
'otpauth://$kind/$issuer:$account?secret=$secret&issuer=$issuer&algorithm=$algorithm&digits=$digits&counter=$counter'; 'otpauth://$kind/$issuer:$account?secret=$secret&issuer=$issuer&algorithm=$algorithm&digits=$digits&counter=$counter';
} else { } else {
throw Exception('Invalid OTP type'); throw Exception('Invalid OTP type: $kind');
} }
parsedCodes.add(Code.fromOTPAuthUrl(otpUrl)); parsedCodes.add(Code.fromOTPAuthUrl(otpUrl));
} }

7
auth/lib/ui/settings/data/import/bitwarden_import.dart
View File

@ -14,6 +14,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
import 'package:file_picker/file_picker.dart'; import 'package:file_picker/file_picker.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
Future<void> showBitwardenImportInstruction(BuildContext context) async { Future<void> showBitwardenImportInstruction(BuildContext context) async {
final l10n = context.l10n; final l10n = context.l10n;
@ -60,12 +61,13 @@ Future<void> _pickBitwardenJsonFile(BuildContext context) async {
if (count != null) { if (count != null) {
await importSuccessDialog(context, count); await importSuccessDialog(context, count);
} }
} catch (e) { } catch (e,s) {
Logger("BitwardenImport").severe('Failed to import',e,s);
await progressDialog.hide(); await progressDialog.hide();
await showErrorDialog( await showErrorDialog(
context, context,
context.l10n.sorry, context.l10n.sorry,
context.l10n.importFailureDesc, "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
); );
} }
} }
@ -90,7 +92,6 @@ Future<int?> _processBitwardenExportFile(
} else { } else {
var issuer = item['name']; var issuer = item['name'];
var account = item['login']['username']; var account = item['login']['username'];
code = Code.fromAccountAndSecret( code = Code.fromAccountAndSecret(
Type.totp, Type.totp,
account, account,

6
auth/lib/ui/settings/data/import/lastpass_import.dart
View File

@ -14,6 +14,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
import 'package:file_picker/file_picker.dart'; import 'package:file_picker/file_picker.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
Future<void> showLastpassImportInstruction(BuildContext context) async { Future<void> showLastpassImportInstruction(BuildContext context) async {
final l10n = context.l10n; final l10n = context.l10n;
@ -60,12 +61,13 @@ Future<void> _pickLastpassJsonFile(BuildContext context) async {
if (count != null) { if (count != null) {
await importSuccessDialog(context, count); await importSuccessDialog(context, count);
} }
} catch (e) { } catch (e, s) {
Logger('LastPassImport').severe('exception while processing import', e, s);
await progressDialog.hide(); await progressDialog.hide();
await showErrorDialog( await showErrorDialog(
context, context,
context.l10n.sorry, context.l10n.sorry,
context.l10n.importFailureDesc, "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
); );
} }
} }

6
auth/lib/ui/settings/data/import/raivo_plain_text_import.dart
View File

@ -14,6 +14,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
import 'package:file_picker/file_picker.dart'; import 'package:file_picker/file_picker.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
Future<void> showRaivoImportInstruction(BuildContext context) async { Future<void> showRaivoImportInstruction(BuildContext context) async {
final l10n = context.l10n; final l10n = context.l10n;
@ -60,12 +61,13 @@ Future<void> _pickRaivoJsonFile(BuildContext context) async {
if (count != null) { if (count != null) {
await importSuccessDialog(context, count); await importSuccessDialog(context, count);
} }
} catch (e) { } catch (e, s) {
Logger("RaivoImport").severe('Failed to import', e, s);
await progressDialog.hide(); await progressDialog.hide();
await showErrorDialog( await showErrorDialog(
context, context,
context.l10n.sorry, context.l10n.sorry,
context.l10n.importFailureDesc, "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
); );
} }
} }

2
auth/lib/ui/settings/data/import/two_fas_import.dart
View File

@ -72,7 +72,7 @@ Future<void> _pick2FasFile(BuildContext context) async {
await showErrorDialog( await showErrorDialog(
context, context,
context.l10n.sorry, context.l10n.sorry,
context.l10n.importFailureDesc, "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
); );
} }
} }