diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 51dd464a..1ac331ac 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -84,6 +84,11 @@ jobs: KAKAO_CHANNEL_ID: ${{ secrets.KAKAO_CHANNEL_ID }} run: echo "KAKAO_CHANNEL_ID=\"$KAKAO_CHANNEL_ID\"" >> local.properties + - name: Access REMOTE_KEY_FORCE_UPDATE + env: + REMOTE_KEY_FORCE_UPDATE: ${{ secrets.REMOTE_KEY_FORCE_UPDATE }} + run: echo "REMOTE_KEY_FORCE_UPDATE=\"$REMOTE_KEY_FORCE_UPDATE\"" >> local.properties + - name: Access KEY_ALIAS env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c1c15847..1f0b65c9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -79,6 +79,11 @@ jobs: env: KAKAO_CHANNEL_ID: ${{ secrets.KAKAO_CHANNEL_ID }} run: echo "KAKAO_CHANNEL_ID=\"$KAKAO_CHANNEL_ID\"" >> local.properties + + - name: Access REMOTE_KEY_FORCE_UPDATE + env: + REMOTE_KEY_FORCE_UPDATE: ${{ secrets.REMOTE_KEY_FORCE_UPDATE }} + run: echo "REMOTE_KEY_FORCE_UPDATE=\"$REMOTE_KEY_FORCE_UPDATE\"" >> local.properties - name: Add kakao_strings.xml env: diff --git a/app/build.gradle b/app/build.gradle index f1f75682..70a8fede 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,6 +35,7 @@ android { buildConfigField "String", "NAVER_CLIENT_ID", properties["NAVER_CLIENT_ID"] buildConfigField "String", "GOOGLE_CLIENT_ID", properties["GOOGLE_CLIENT_ID"] buildConfigField "String", "REMOTE_KEY_APP_VERSION", properties["REMOTE_KEY_APP_VERSION"] + buildConfigField "String", "REMOTE_KEY_FORCE_UPDATE", properties["REMOTE_KEY_FORCE_UPDATE"] buildConfigField "String", "KAKAO_CHANNEL_ID", properties["KAKAO_CHANNEL_ID"] } diff --git a/app/src/main/java/com/runnect/runnect/presentation/MainActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/MainActivity.kt index 54c3c8b3..c5fadbee 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/MainActivity.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/MainActivity.kt @@ -9,6 +9,7 @@ import com.google.firebase.Firebase import com.google.firebase.remoteconfig.remoteConfig import com.google.firebase.remoteconfig.remoteConfigSettings import com.runnect.runnect.BuildConfig.REMOTE_KEY_APP_VERSION +import com.runnect.runnect.BuildConfig.REMOTE_KEY_FORCE_UPDATE import com.runnect.runnect.R import com.runnect.runnect.binding.BindingActivity import com.runnect.runnect.databinding.ActivityMainBinding @@ -136,8 +137,9 @@ class MainActivity : BindingActivity(R.layout.activity_main fetchAndActivate().addOnCompleteListener { task -> if (task.isSuccessful) { + val forceUpdate = getBoolean(REMOTE_KEY_FORCE_UPDATE) val updateAppVersion = getString(REMOTE_KEY_APP_VERSION) - if (localAppVersion != updateAppVersion) { + if (forceUpdate && localAppVersion != updateAppVersion) { initUpdateDialog() } }