0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: parsing of rawData and sorting while fetching codes

Browse source
This commit is contained in:
Prateek Sunal 2024-04-27 13:32:01 +05:30
parent 38b0046885
commit e26c817e18
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
auth/lib/store/code_store.dart
View file

@ -28,22 +28,29 @@ class CodeStore {
await _authenticatorService.getEntities(mode);
final List<Code> codes = [];
for (final entity in entities) {
final decodeJson = jsonDecode(entity.rawData);
if (decodeJson is String && decodeJson.startsWith('otpauth://')) {
final code = Code.fromOTPAuthUrl(decodeJson);
code.generatedID = entity.generatedID;
code.hasSynced = entity.hasSynced;
codes.add(code);
} else {
final code = Code.fromExportJson(decodeJson);
code.generatedID = entity.generatedID;
code.hasSynced = entity.hasSynced;
codes.add(code);
try {
if (entity.rawData.startsWith('otpauth://')) {
final code = Code.fromOTPAuthUrl(entity.rawData);
code.generatedID = entity.generatedID;
code.hasSynced = entity.hasSynced;
codes.add(code);
} else {
final decodeJson = jsonDecode(entity.rawData);
final code = Code.fromExportJson(decodeJson);
code.generatedID = entity.generatedID;
code.hasSynced = entity.hasSynced;
codes.add(code);
}
} catch (e) {
_logger.severe("Could not parse code", e);
}
}
// sort codes by issuer,account
codes.sort((a, b) {
if (b.isPinned && !a.isPinned) return 1;
if (!b.isPinned && a.isPinned) return -1;
final issuerComparison = compareAsciiLowerCaseNatural(a.issuer, b.issuer);
if (issuerComparison != 0) {
return issuerComparison;

5
auth/lib/ui/home_page.dart
View file

@ -260,11 +260,6 @@ class _HomePageState extends State<HomePage> {
onManuallySetupTap: _redirectToManualEntryPage,
);
} else {
_filteredCodes.sort((a, b) {
if (b.isPinned && !a.isPinned) return 1;
if (!b.isPinned && a.isPinned) return -1;
return 0;
});
final list = AlignedGridView.count(
crossAxisCount: (MediaQuery.sizeOf(context).width ~/ 400)
.clamp(1, double.infinity)