diff --git a/dist/hap-sign-tool.jar b/dist/hap-sign-tool.jar index ef39092cbf96d3235303a652786724e06ee08d93..0257b52ff85021e4b584235c09ad234c9758255a 100644 Binary files a/dist/hap-sign-tool.jar and b/dist/hap-sign-tool.jar differ diff --git a/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntool/HapSignTool.java b/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntool/HapSignTool.java index 4c8d7fb1804ad21e74816a6290a97f97d9dab36c..584816d2652508b702073565d6dc90d47021f978 100644 --- a/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntool/HapSignTool.java +++ b/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntool/HapSignTool.java @@ -96,9 +96,9 @@ public final class HapSignTool { public static boolean processCmd(String[] args) throws CustomException { if (args.length == 0 || StringUtils.isEmpty(args[0])) { help(); - } else if (args[0].equals("-h") || args[0].contains("-help")) { + } else if ("-h".equals(args[0]) || "-help".equals(args[0])) { help(); - } else if (args[0].equals("-v") || args[0].contains("-version")) { + } else if ("-v".equals(args[0]) || "-version".equals(args[0])) { version(); } else { ServiceApi api = new SignToolServiceImpl(); diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/api/LocalizationAdapter.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/api/LocalizationAdapter.java index a60a38fe784ea6ed9c2c101d3645172b1407c33d..981adf6060d0f98b771d05960fcf2e5abb54c224 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/api/LocalizationAdapter.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/api/LocalizationAdapter.java @@ -248,7 +248,7 @@ public class LocalizationAdapter { */ public boolean isOutFormChain() { String outForm = options.getString(Options.OUT_FORM, "certChain"); - return outForm.equals("certChain"); + return "certChain".equals(outForm); } /** diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/entity/SignatureBlockTypes.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/entity/SignatureBlockTypes.java index f1827dc6f150dbc7435bcfa1be110eeef08442a4..81b6ac7666ef7f4da204bfd16a46cfcdaaf317a6 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/entity/SignatureBlockTypes.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/entity/SignatureBlockTypes.java @@ -52,10 +52,10 @@ public class SignatureBlockTypes { * @return profile block type value */ public static char getProfileBlockTypes(String isSigned) { - if (isSigned != null && isSigned.equals("0")) { + if (isSigned != null && "0".equals(isSigned)) { return PROFILE_NOSIGNED_BLOCK; } - if (isSigned != null && isSigned.equals("1")) { + if (isSigned != null && "1".equals(isSigned)) { return PROFILE_SIGNED_BLOCK; } return PROFILE_NOSIGNED_BLOCK; diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/profile/model/Provision.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/profile/model/Provision.java index 6feda36b98f40a7b1eb6271020e2355862ab4d9b..15df101edc43f37d6878baf46e7adb3045625c1d 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/profile/model/Provision.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/profile/model/Provision.java @@ -160,7 +160,7 @@ public class Provision { /** * buildType valid * @param buildType buildType - * @return + * @return BuildType Valid */ public static boolean isBuildTypeValid(String buildType) { return DEBUG.equals(buildType) || RELEASE.equals(buildType); @@ -169,7 +169,7 @@ public class Provision { /** * buildType valid * @param buildType buildType - * @return + * @return Is the buildType release */ public static boolean isBuildTypeRelease(String buildType) { return RELEASE.equals(buildType); diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/ProfileUtils.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/ProfileUtils.java index 65d1fdd77d0c98e213db31c3169174597e685603..96c17df1522eeb20f1660d04bf4e33f4394df757 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/ProfileUtils.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/ProfileUtils.java @@ -40,6 +40,6 @@ public class ProfileUtils { String json = JsonParser.parseString(new String(bytes, StandardCharsets.UTF_8)).toString(); Provision provision = FileUtils.GSON.fromJson(new String(bytes, StandardCharsets.UTF_8), Provision.class); Provision.enforceValid(provision); - return json.getBytes(); + return json.getBytes(StandardCharsets.UTF_8); } } \ No newline at end of file