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

Minor refactor

Browse source
This commit is contained in:
Neeraj Gupta 2024-05-21 14:36:53 +05:30
parent a4d6fece41
commit 2abc57f981
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
auth/lib/models/code_display.dart
View file

@ -58,17 +58,11 @@ class CodeDisplay {
/// Converts the [CodeDisplay] to a json object.
/// When [safeParsing] is true, the json will be parsed safely.
/// If we fail to parse the json, we will return an empty [CodeDisplay].
static CodeDisplay? fromUri(Uri uri, {bool safeParsing = true}) {
try {
static CodeDisplay? fromUri(Uri uri, {bool safeParsing = false}) {
if (!uri.queryParameters.containsKey("codeDisplay")) return null;
final String codeDisplay =
uri.queryParameters['codeDisplay']!.replaceAll('%2C', ',');
return _parseCodeDisplayJson(codeDisplay, safeParsing);
} catch (e, s) {
Logger("CodeDisplay")
.severe("Could not parse code display from uri", e, s);
return null;
}
}
static CodeDisplay _parseCodeDisplayJson(String json, bool safeParsing) {
@ -78,14 +72,9 @@ class CodeDisplay {
} catch (e, s) {
Logger("CodeDisplay")
.severe("Could not parse code display from json", e, s);
// if the json does not end with a }, it's likely bad data is attached.
// This is a workaround to prevent the app from crashing.
if (!json.endsWith("}")) {
final lastBracket = json.lastIndexOf("}");
if (lastBracket != -1) {
final validJson = json.substring(0, lastBracket + 1);
return _parseCodeDisplayJson(validJson, safeParsing);
}
// (ng/prateek) Handle the case where we have fragment in the rawDataUrl
if (!json.endsWith("}") && json.contains("}#")) {
return CodeDisplay();
}
if (safeParsing) {
return CodeDisplay();