Skip to content

Commit 4651fca

Browse files
authored
Merge pull request #376 from Runnect/feature/force-update-remote-config
Remote Config force_update 플래그 기반 업데이트 팝업 제어
2 parents 9c62c23 + 720cd30 commit 4651fca

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

.github/workflows/CD.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ jobs:
8484
KAKAO_CHANNEL_ID: ${{ secrets.KAKAO_CHANNEL_ID }}
8585
run: echo "KAKAO_CHANNEL_ID=\"$KAKAO_CHANNEL_ID\"" >> local.properties
8686

87+
- name: Access REMOTE_KEY_FORCE_UPDATE
88+
env:
89+
REMOTE_KEY_FORCE_UPDATE: ${{ secrets.REMOTE_KEY_FORCE_UPDATE }}
90+
run: echo "REMOTE_KEY_FORCE_UPDATE=\"$REMOTE_KEY_FORCE_UPDATE\"" >> local.properties
91+
8792
- name: Access KEY_ALIAS
8893
env:
8994
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}

.github/workflows/CI.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ jobs:
7979
env:
8080
KAKAO_CHANNEL_ID: ${{ secrets.KAKAO_CHANNEL_ID }}
8181
run: echo "KAKAO_CHANNEL_ID=\"$KAKAO_CHANNEL_ID\"" >> local.properties
82+
83+
- name: Access REMOTE_KEY_FORCE_UPDATE
84+
env:
85+
REMOTE_KEY_FORCE_UPDATE: ${{ secrets.REMOTE_KEY_FORCE_UPDATE }}
86+
run: echo "REMOTE_KEY_FORCE_UPDATE=\"$REMOTE_KEY_FORCE_UPDATE\"" >> local.properties
8287

8388
- name: Add kakao_strings.xml
8489
env:

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ android {
3535
buildConfigField "String", "NAVER_CLIENT_ID", properties["NAVER_CLIENT_ID"]
3636
buildConfigField "String", "GOOGLE_CLIENT_ID", properties["GOOGLE_CLIENT_ID"]
3737
buildConfigField "String", "REMOTE_KEY_APP_VERSION", properties["REMOTE_KEY_APP_VERSION"]
38+
buildConfigField "String", "REMOTE_KEY_FORCE_UPDATE", properties["REMOTE_KEY_FORCE_UPDATE"]
3839
buildConfigField "String", "KAKAO_CHANNEL_ID", properties["KAKAO_CHANNEL_ID"]
3940
}
4041

app/src/main/java/com/runnect/runnect/presentation/MainActivity.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.google.firebase.Firebase
99
import com.google.firebase.remoteconfig.remoteConfig
1010
import com.google.firebase.remoteconfig.remoteConfigSettings
1111
import com.runnect.runnect.BuildConfig.REMOTE_KEY_APP_VERSION
12+
import com.runnect.runnect.BuildConfig.REMOTE_KEY_FORCE_UPDATE
1213
import com.runnect.runnect.R
1314
import com.runnect.runnect.binding.BindingActivity
1415
import com.runnect.runnect.databinding.ActivityMainBinding
@@ -136,8 +137,9 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
136137

137138
fetchAndActivate().addOnCompleteListener { task ->
138139
if (task.isSuccessful) {
140+
val forceUpdate = getBoolean(REMOTE_KEY_FORCE_UPDATE)
139141
val updateAppVersion = getString(REMOTE_KEY_APP_VERSION)
140-
if (localAppVersion != updateAppVersion) {
142+
if (forceUpdate && localAppVersion != updateAppVersion) {
141143
initUpdateDialog()
142144
}
143145
}

0 commit comments

Comments
 (0)