fix: 修复版本号返回为空导致的崩溃

DUpdateSystem · Jan 7, 2022 · 5a35203 · 5a35203
1 parent eb2a0d2
commit 5a35203
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "net.xzos.upgradeall"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 90
-        versionName "0.11"
+        versionCode 91
+        versionName "0.11-rc.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         kapt {
             arguments {

diff --git a/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/json/ReleaseGson.kt b/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/json/ReleaseGson.kt
@@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName
 
 data class ReleaseGson(
     @SerializedName("version_number") val versionNumber: String,
-    @SerializedName("change_log") val changelog: String,
+    @SerializedName("change_log") val changelog: String?,
     @SerializedName("assets") val assetList: List<Assets>,
 )
 

diff --git a/core/src/main/java/net/xzos/upgradeall/core/module/app/data/DataGetter.kt b/core/src/main/java/net/xzos/upgradeall/core/module/app/data/DataGetter.kt
@@ -82,7 +82,7 @@ internal class DataGetter(private val dataStorage: DataStorage) {
                     )
                 }
             )
-            assetsList.add(asset)
+            asset?.apply { assetsList.add(this) }
         }
         dataStorage.versionData.addAsset(assetsList, hub.uuid)
     }

diff --git a/core/src/main/java/net/xzos/upgradeall/core/module/app/version_item/Asset.kt b/core/src/main/java/net/xzos/upgradeall/core/module/app/version_item/Asset.kt
@@ -27,9 +27,10 @@ class Asset private constructor(
         )
 
         fun newInstance(
-            versionNumber: String, hub: Hub, changelog: String?,
+            versionNumber: String?, hub: Hub, changelog: String?,
             _fileAssetList: List<TmpFileAsset>
-        ): Asset {
+        ): Asset? {
+            if (versionNumber == null) return null
             val fileAssetList: List<FileAsset> = _fileAssetList.map {
                 FileAsset(it.name, it.downloadUrl, it.fileType, it.assetIndex, hub)
             }
-Original file line number
+Diff line change
@@ Expand Up @@
                         )
                     }
                 )
-                assetsList.add(asset)
+                asset?.apply { assetsList.add(this) }
             }
             dataStorage.versionData.addAsset(assetsList, hub.uuid)
         }
@@ Expand Down @@