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

Allow setting null (empty) nickname

Browse Source
This commit is contained in:
Laiteux
2025-11-07 20:03:04 +04:00
parent ec7874b519
commit e28b904afd
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,10 +121,10 @@ public class LpaProvider extends ContentProvider
// out (many, can be empty): int slotId, int portId // out (many, can be empty): int slotId, int portId
case "cards" -> handleGetCards(args); case "cards" -> handleGetCards(args);
// in: int slotId, int portId // in: int slotId, int portId
// out (many, can be empty): string iccid, bool enabled, string? nickname, string provider // out (many, can be empty): string iccid, bool enabled, string provider, string? nickname
case "profiles" -> handleGetProfiles(args); case "profiles" -> handleGetProfiles(args);
// in: int slotId, int portId, (either {string activationCode} or {string address, string? matchingId}), string? confirmationCode, string? imei, string? callbackUrl // in: int slotId, int portId, (either {string activationCode} or {string address, string? matchingId}), string? confirmationCode, string? imei, string? callbackUrl
// out (single, can be empty): string iccid, bool enabled, string? nickname, string provider // out (single, can be empty): string iccid, bool enabled, string provider, string? nickname
case "downloadProfile" -> handleDownloadProfile(args); case "downloadProfile" -> handleDownloadProfile(args);
// in: int slotId, int portId, string iccid // in: int slotId, int portId, string iccid
// out: bool success // out: bool success
@@ -132,7 +132,7 @@ public class LpaProvider extends ContentProvider
// in: int slotId, int portId, string iccid, bool refresh=true // in: int slotId, int portId, string iccid, bool refresh=true
// out: bool success // out: bool success
case "enableProfile" -> handleEnableProfile(args); case "enableProfile" -> handleEnableProfile(args);
// in: int slotId, int portId, string iccid, string? nickname, string provider // in: int slotId, int portId, string iccid, string? nickname
// out: bool success // out: bool success
case "setProfileNickname" -> handleSetProfileNickname(args); case "setProfileNickname" -> handleSetProfileNickname(args);
default -> error("unknown_endpoint"); default -> error("unknown_endpoint");
@@ -287,7 +287,7 @@ public class LpaProvider extends ContentProvider
String[] address = new String[1]; String[] address = new String[1];
String[] matchingId = { args.get("matchingId") }; String[] matchingId = { args.get("matchingId") };
String[] confirmationCode = { args.get("confirmationCode") }; String[] confirmationCode = { args.get("confirmationCode") };
String imei = args.get("imei"); String[] imei = { args.get("imei") };
String[] activationCodeArg = new String[1]; String[] activationCodeArg = new String[1];
@@ -320,7 +320,7 @@ public class LpaProvider extends ContentProvider
( (
address[0], address[0],
matchingId[0], matchingId[0],
imei, imei[0],
confirmationCode[0], confirmationCode[0],
new ProfileDownloadCallback() new ProfileDownloadCallback()
{ {
@@ -348,7 +348,7 @@ public class LpaProvider extends ContentProvider
put("address", address[0]); put("address", address[0]);
put("matchingId", matchingId[0]); put("matchingId", matchingId[0]);
put("confirmationCode", confirmationCode[0]); put("confirmationCode", confirmationCode[0]);
put("imei", imei); put("imei", imei[0]);
}}; }};
httpPostAsJson(url, data); httpPostAsJson(url, data);
@@ -437,13 +437,13 @@ public class LpaProvider extends ContentProvider
private MatrixCursor handleSetProfileNickname(Map<String, String> args) throws Exception private MatrixCursor handleSetProfileNickname(Map<String, String> args) throws Exception
{ {
String[] iccid = new String[1]; String[] iccid = new String[1];
String[] nickname = new String[1]; String[] nickname = { args.get("nickname") };
if (!tryGetArgAsString(args, "iccid", iccid)) if (!tryGetArgAsString(args, "iccid", iccid))
return missingArgError("iccid"); return missingArgError("iccid");
if (!tryGetArgAsString(args, "nickname", nickname)) if (nickname[0] == null)
return missingArgError("nickname"); nickname[0] = "";
withEuiccChannel withEuiccChannel
( (
@@ -785,17 +785,25 @@ public class LpaProvider extends ContentProvider
{ {
"iccid", "iccid",
"enabled", "enabled",
"nickname", "provider",
"providerName" "nickname"
}; };
Object[][] rows = profiles.stream() Object[][] rows = profiles.stream()
.map(p -> new Object[] .map(p ->
{ {
p.getIccid(), var nickname = p.getNickName();
LPAUtilsKt.isEnabled(p),
p.getNickName().isEmpty() ? null : p.getNickName(), if (nickname.isEmpty())
p.getProviderName() nickname = null;
return new Object[]
{
p.getIccid(),
LPAUtilsKt.isEnabled(p),
p.getProviderName(),
nickname
};
}) })
.toArray(Object[][]::new); .toArray(Object[][]::new);