Skip to content

Commit 61b58f4

Browse files
committed
fix: Better handling of durations. Fixes #4.
1 parent 5578a76 commit 61b58f4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/model/totp/json.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ extension JsonTotp on Totp {
1717
encryptedData: encryptedData,
1818
algorithm: data[Totp.kAlgorithmKey] is! String ? null : Algorithm.fromString(data[Totp.kAlgorithmKey]),
1919
digits: data[Totp.kDigitsKey] is! int ? null : data[Totp.kDigitsKey],
20-
validity: data[Totp.kValidityKey] is! int ? null : data[Totp.kValidityKey],
20+
validity: data[Totp.kValidityKey] is! int ? null : Duration(seconds: data[Totp.kValidityKey]),
2121
);
2222
}
2323

@@ -27,7 +27,7 @@ extension JsonTotp on Totp {
2727
...encryptedData.toJson(),
2828
if (algorithm != null) Totp.kAlgorithmKey: algorithm!.name,
2929
if (digits != null) Totp.kDigitsKey: digits,
30-
if (validity != null) Totp.kValidityKey: validity,
30+
if (validity != null) Totp.kValidityKey: validity!.inSeconds,
3131
};
3232
}
3333

lib/pages/totp.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ class _TotpPageState extends ConsumerState<TotpPage> with BrightnessListener {
297297
),
298298
ListTilePadding(
299299
child: TextFormField(
300-
initialValue: validity?.toString(),
300+
initialValue: validity?.inSeconds.toString(),
301301
onChanged: (value) {
302302
int? validity = int.tryParse(value);
303303
setState(() => this.validity = validity == null ? null : Duration(seconds: validity));
@@ -306,7 +306,7 @@ class _TotpPageState extends ConsumerState<TotpPage> with BrightnessListener {
306306
decoration: FormLabelWithIcon(
307307
icon: Icons.schedule,
308308
text: translations.totp.page.validity,
309-
hintText: Totp.kDefaultValidity.toString(),
309+
hintText: Totp.kDefaultValidity.inSeconds.toString(),
310310
),
311311
validator: validateValidity,
312312
enabled: enabled,

0 commit comments

Comments
 (0)