openclaw/openeuicc-bridge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return rows as JSON only if json query param

Browse Source
This commit is contained in:
Laiteux
2025-11-05 20:01:02 +04:00
parent 96e2b2c706
commit a1b05d907f
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/im/angry/openeuicc/bridge/LpaProvider.java
View File

@@ -83,6 +83,8 @@ public class LpaProvider extends ContentProvider
final String path = uri.getLastPathSegment(); final String path = uri.getLastPathSegment();
final Map<String, String> args = getArgsFromUri(uri); final Map<String, String> args = getArgsFromUri(uri);
boolean[] json = new boolean[1];
if (path == null) if (path == null)
{ {
rows = error("no_path"); rows = error("no_path");
@@ -167,10 +169,11 @@ public class LpaProvider extends ContentProvider
} }
rows = projectColumns(rows, projection, new String[] { "error" }); rows = projectColumns(rows, projection, new String[] { "error" });
// return rows;
String rowsJson = rowsToJson(rows); if (tryGetArgAsBoolean(args, "json", json) && json[0])
return row("rows", rowsJson); rows = row("rows", rowsToJson(rows));
return rows;
} }
// region Mandatory Overrides // region Mandatory Overrides
@@ -746,14 +749,14 @@ public class LpaProvider extends ContentProvider
private static boolean tryGetArgAsInt(Map<String, String> args, String key, int[] out) private static boolean tryGetArgAsInt(Map<String, String> args, String key, int[] out)
{ {
String[] arg = new String[1]; String arg = args.get(key);
if (!tryGetArgAsString(args, key, arg)) if (arg == null || arg.isEmpty())
return false; return false;
try try
{ {
out[0] = Integer.parseInt(arg[0]); out[0] = Integer.parseInt(arg);
return true; return true;
} }
catch (NumberFormatException ex) catch (NumberFormatException ex)
@@ -764,15 +767,16 @@ public class LpaProvider extends ContentProvider
private static boolean tryGetArgAsBoolean(Map<String, String> args, String key, boolean[] out) private static boolean tryGetArgAsBoolean(Map<String, String> args, String key, boolean[] out)
{ {
String[] arg = new String[1]; String arg = args.get(key);
if (!tryGetArgAsString(args, key, arg)) if (arg == null)
return false; return false;
out[0] = arg[0].equals("1") out[0] = arg.isEmpty()
|| arg[0].toLowerCase().startsWith("y") || arg.equals("1")
|| arg[0].equalsIgnoreCase("on") || arg.toLowerCase().startsWith("y")
|| arg[0].equalsIgnoreCase("true"); || arg.equalsIgnoreCase("on")
|| arg.equalsIgnoreCase("true");
return true; return true;
} }