fix: v1 签名状态下读取渠道信息为空（根据上游 repo 的 PR Tencent#158）

dandycheung · Feb 6, 2025 · 083e950 · 083e950
1 parent fb668cd
commit 083e950
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/command/src/main/java/com/tencent/vasdolly/command/Util.java b/command/src/main/java/com/tencent/vasdolly/command/Util.java
@@ -73,7 +73,7 @@ public static String getSignMode(File apkFile) {
      */
     public static String readChannel(File apkFile) {
         String channel = ChannelReader.getChannelByV2(apkFile);
-        if (channel == null) {
+        if (channel.isEmpty()) {
             channel = ChannelReader.getChannelByV1(apkFile);
         }
         return channel;
@@ -185,7 +185,7 @@ private static void generateV1ChannelApk(File baseApk, List<String> channelList,
         //判断基础包是否已经包含渠道信息
 
         String testChannel = ChannelReader.getChannelByV1(baseApk);
-        if (testChannel != null) {
+        if (!testChannel.isEmpty()) {
             System.out.println("baseApk : " + baseApk.getAbsolutePath() + " has a channel : " + testChannel + ", only ignore");
             return;
         }
@@ -240,7 +240,7 @@ private static void generateV1ChannelApkMultiThread(File baseApk, List<String> c
         String apkName = baseApk.getName();
         //判断基础包是否已经包含渠道信息
         String testChannel = ChannelReader.getChannelByV1(baseApk);
-        if (testChannel != null) {
+        if (!testChannel.isEmpty()) {
             System.out.println("baseApk : " + baseApk.getAbsolutePath() + " has a channel : " + testChannel + ", only ignore");
             return;
         }

diff --git a/helper/src/main/java/com/tencent/vasdolly/helper/ChannelReaderUtil.java b/helper/src/main/java/com/tencent/vasdolly/helper/ChannelReaderUtil.java
@@ -39,7 +39,7 @@ public class ChannelReaderUtil {
     public static String getChannel(Context context) {
         if (mChannelCache == null) {
             String channel = getChannelByV2(context);
-            if (channel == null) {
+            if (channel.isEmpty()) {
                 channel = getChannelByV1(context);
             }
             mChannelCache = channel;

diff --git a/plugin/src/main/kotlin/com/tencent/vasdolly/plugin/task/BaseTask.kt b/plugin/src/main/kotlin/com/tencent/vasdolly/plugin/task/BaseTask.kt
@@ -116,7 +116,7 @@ abstract class BaseTask : DefaultTask() {
 
         // 检查是否已经有渠道信息
         val apkChannel = ChannelReader.getChannelByV1(baseApk)
-        if (apkChannel != null && apkChannel.isNotEmpty())
+        if (apkChannel.isNotEmpty())
             throw GradleException("baseApk $baseApk.getAbsolutePath() has channel already")
 
         channelList.forEach { channel ->