fix: 修复软件详情页面崩溃

修复软件详情页面因无法获取到 app 对象导致的崩溃
DUpdateSystem · Nov 3, 2020 · 4f132c5 · 4f132c5
1 parent 37f91b2
commit 4f132c5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         applicationId "net.xzos.upgradeall"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 50
-        versionName "0.1.4.22"
+        versionCode 51
+        versionName "0.1.4.24"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         kapt {
             arguments {

diff --git a/app/src/main/java/net/xzos/upgradeall/ui/activity/detail/AppDetailActivity.kt b/app/src/main/java/net/xzos/upgradeall/ui/activity/detail/AppDetailActivity.kt
@@ -1,5 +1,7 @@
 package net.xzos.upgradeall.ui.activity.detail
 
+import android.content.Context
+import android.content.Intent
 import android.content.res.ColorStateList
 import android.os.Bundle
 import android.os.NetworkOnMainThreadException
@@ -44,6 +46,7 @@ class AppDetailActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_app_detail)
+        bundleApp?.run { app = this } ?: onBackPressed()
         initView()
     }
 
@@ -55,7 +58,6 @@ class AppDetailActivity : BaseActivity() {
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        bundleApp?.run { app = this }
         initUi()
 
         ib_edit.setOnClickListener {
@@ -249,11 +251,11 @@ class AppDetailActivity : BaseActivity() {
     }
 
     companion object {
-        internal var bundleApp: App? = null
-            get() {
-                val app = field
-                field = null
-                return app
-            }
+        private var bundleApp: App? = null
+
+        fun startActivity(context: Context, app: App) {
+            bundleApp = app
+            context.startActivity(Intent(context, AppDetailActivity::class.java))
+        }
     }
 }
diff --git a/app/src/main/java/net/xzos/upgradeall/ui/viewmodels/adapters/AppListItemAdapter.kt b/app/src/main/java/net/xzos/upgradeall/ui/viewmodels/adapters/AppListItemAdapter.kt
@@ -1,6 +1,5 @@
 package net.xzos.upgradeall.ui.viewmodels.adapters
 
-import android.content.Intent
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
@@ -50,8 +49,7 @@ class AppListItemAdapter(
             if (holder.adapterPosition == RecyclerView.NO_POSITION) return@setOnClickListener
             when (val baseApp = mItemCardViewList.getByHolder(holder).extraData.app) {
                 is App -> {
-                    AppDetailActivity.bundleApp = baseApp
-                    it.context.startActivity(Intent(it.context, AppDetailActivity::class.java))
+                    AppDetailActivity.startActivity(it.context, baseApp)
                 }
                 is Applications -> {
                     ApplicationsFragment.bundleApplications = baseApp

diff --git a/app/src/main/java/net/xzos/upgradeall/ui/viewmodels/adapters/ApplicationsItemAdapter.kt b/app/src/main/java/net/xzos/upgradeall/ui/viewmodels/adapters/ApplicationsItemAdapter.kt
@@ -1,6 +1,5 @@
 package net.xzos.upgradeall.ui.viewmodels.adapters
 
-import android.content.Intent
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
@@ -30,10 +29,7 @@ class ApplicationsItemAdapter(
             if (holder.adapterPosition == NO_POSITION) return@setOnClickListener
             val app = mItemCardViewList.getByHolder(holder).extraData.app
             if (app is App) {
-                AppDetailActivity.bundleApp = app
-                with(holder.itemCardView.context) {
-                    startActivity(Intent(this, AppDetailActivity::class.java))
-                }
+                AppDetailActivity.startActivity(holder.itemCardView.context, app)
             }
         }
         holder.itemCardView.setOnLongClickListener { view ->