#503 [FIX] in_app_update

인앱 업데이트 수정
TeamNado-Sunbae · Mar 27, 2022 · cbbeb34 · cbbeb34
1 parent d153da9
commit cbbeb34
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 22 deletions.
diff --git a/app/src/main/java/com/nadosunbae_android/app/presentation/ui/main/SplashActivity.kt b/app/src/main/java/com/nadosunbae_android/app/presentation/ui/main/SplashActivity.kt
@@ -6,7 +6,6 @@ import android.content.IntentSender
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
 import android.widget.Toast
 import androidx.core.content.res.ResourcesCompat
 import com.google.android.material.snackbar.Snackbar
@@ -18,15 +17,12 @@ import com.google.android.play.core.install.InstallStateUpdatedListener
 import com.google.android.play.core.install.model.AppUpdateType
 import com.google.android.play.core.install.model.InstallStatus
 import com.google.android.play.core.install.model.UpdateAvailability
-import com.google.firebase.analytics.ktx.analytics
-import com.google.firebase.ktx.Firebase
 import com.nadosunbae_android.app.R
 import com.nadosunbae_android.app.databinding.ActivitySplashBinding
 import com.nadosunbae_android.app.presentation.base.BaseActivity
 import com.nadosunbae_android.app.presentation.ui.main.viewmodel.SplashViewModel
 import com.nadosunbae_android.app.presentation.ui.onboarding.OnBoardingActivity
 import com.nadosunbae_android.app.presentation.ui.sign.SignInActivity
-import com.nadosunbae_android.app.util.FirebaseAnalyticsUtil
 import com.nadosunbae_android.app.util.NadoSunBaeSharedPreference
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
@@ -35,18 +31,15 @@ import timber.log.Timber
 class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_splash) {
 
     private val splashViewModel : SplashViewModel by viewModel()
-
     private var loginSuccess = false
     private var notification = -1
     private lateinit var appUpdateManager: AppUpdateManager
 
-    //업데이트 상태 확인인
-    var installStateUpdatedListener: InstallStateUpdatedListener = object : InstallStateUpdatedListener {
+    //업데이트 상태 확인
+    private var installStateUpdatedListener: InstallStateUpdatedListener = object : InstallStateUpdatedListener {
         override fun onStateUpdate(state: InstallState) {
-
             if (state.installStatus() == InstallStatus.DOWNLOADED) {
                 popupSnackbarForCompleteUpdate()
-
             } else if (state.installStatus() == InstallStatus.INSTALLED) {
                 if (appUpdateManager != null) {
                     appUpdateManager?.unregisterListener(this)
@@ -60,12 +53,12 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         setupTimber()
+        updateVersion()
+        divisionUpdateAvailability()
         observeSignIn()
         autoLogin()
-        startLoading()
-        updateVersion()
+
         val bundle: Bundle? = intent.extras
         if (bundle != null) {
             Timber.d("푸쉬 알림 백그라운드에서")
@@ -74,25 +67,35 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
 
 
     }
+    //업데이트 구분
+    private fun divisionUpdateAvailability(){
+        splashViewModel.updateAvailability.observe(this){
+            if(!it){
+                startLoading()
+            }
+        }
+    }
+
+
 
     //버전 업데이트
     private fun updateVersion() {
         appUpdateManager = AppUpdateManagerFactory.create(this)
-        val appUpdateInfoTask = appUpdateManager?.appUpdateInfo
+        val appUpdateInfoTask = appUpdateManager.appUpdateInfo
 
-        appUpdateManager?.registerListener(installStateUpdatedListener)
+        appUpdateManager.registerListener(installStateUpdatedListener)
 
-        appUpdateInfoTask?.addOnSuccessListener { appUpdateInfo ->
+        appUpdateInfoTask.addOnSuccessListener { appUpdateInfo ->
 
             when (appUpdateInfo.updateAvailability()) {
                 UpdateAvailability.UPDATE_AVAILABLE -> {
                     appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE)
-
+                    splashViewModel.updateAvailability.value = true
                     requestUpdate(appUpdateInfo)
                 }
 
                 else -> {
-
+                    splashViewModel.updateAvailability.value = false
                 }
             }
         }
@@ -101,11 +104,11 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
 
     override fun onResume() {
         super.onResume()
-        appUpdateManager?.appUpdateInfo?.addOnSuccessListener{
+        appUpdateManager.appUpdateInfo.addOnSuccessListener{
             if (it.updateAvailability() == UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS) {
                 // 인 앱 업데이트가 실행된 상태라면 계속 업데이트 진행
                 try {
-                    appUpdateManager?.startUpdateFlowForResult(it, AppUpdateType.IMMEDIATE, this, UPDATE)
+                    appUpdateManager.startUpdateFlowForResult(it, AppUpdateType.IMMEDIATE, this, UPDATE)
                 } catch (e: IntentSender.SendIntentException) {
                     e.printStackTrace()
                 }
@@ -182,7 +185,8 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
         val pref = getSharedPreferences("isFirst", MODE_PRIVATE)
         val first = pref.getBoolean("isFirst", false)
 
-        //앱 최초 실행일 때
+
+
         if (first == false) {
             Timber.d("FirstTimeCheck: true")
             val editor = pref.edit()

diff --git a/...rc/main/java/com/nadosunbae_android/app/presentation/ui/main/viewmodel/SplashViewModel.kt b/...rc/main/java/com/nadosunbae_android/app/presentation/ui/main/viewmodel/SplashViewModel.kt
@@ -21,6 +21,8 @@ class SplashViewModel(
     val signIn: LiveData<SignInData>
         get() = _signIn
 
+    //업데이트 확인
+    var updateAvailability = MutableLiveData<Boolean>()
 
     // 토큰 재발급 및 자동 로그인
     fun postRenewalToken() {

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -2,8 +2,8 @@ object Apps {
     const val compileSdk = 31
     const val minSdk = 24
     const val targetSdk = 31
-    var versionCode = 2
-    var versionName = "1.0.1"
+    var versionCode = 3
+    var versionName = "1.1.1"
     const val pacakageName = "com.nadosunbae_android.app"
 }
 object Versions {