Skip to content

Commit 8e57cf8

Browse files
authored
Merge pull request #375 from Runnect/feature/fix-run-timer-broadcast
RunActivity 타이머 크래시 수정 및 서버 URL prod 고정
2 parents 4651fca + 3000d6b commit 8e57cf8

3 files changed

Lines changed: 19 additions & 16 deletions

File tree

app/src/main/java/com/runnect/runnect/application/ApplicationClass.kt

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,22 @@ class ApplicationClass : Application() {
3939
lateinit var appContext: Context
4040
const val API_MODE = "API_MODE"
4141

42-
fun getBaseUrl(): String {
43-
return when {
44-
!BuildConfig.DEBUG -> BuildConfig.RUNNECT_PROD_URL
45-
!::appContext.isInitialized -> BuildConfig.RUNNECT_PROD_URL
46-
else -> {
47-
val mode = ApiMode.getCurrentApiMode(appContext)
48-
Timber.d("현재 서버: ${mode}")
49-
when (mode) {
50-
ApiMode.JAVA -> BuildConfig.RUNNECT_PROD_URL
51-
ApiMode.TEST -> BuildConfig.RUNNECT_DEV_URL
52-
else -> BuildConfig.RUNNECT_NODE_URL
53-
}
54-
}
55-
}
56-
}
42+
// TODO: dev/node 서버 복구 시 분기 복원
43+
// fun getBaseUrl(): String {
44+
// return when {
45+
// !BuildConfig.DEBUG -> BuildConfig.RUNNECT_PROD_URL
46+
// !::appContext.isInitialized -> BuildConfig.RUNNECT_PROD_URL
47+
// else -> {
48+
// val mode = ApiMode.getCurrentApiMode(appContext)
49+
// Timber.d("현재 서버: ${mode}")
50+
// when (mode) {
51+
// ApiMode.JAVA -> BuildConfig.RUNNECT_PROD_URL
52+
// ApiMode.TEST -> BuildConfig.RUNNECT_DEV_URL
53+
// else -> BuildConfig.RUNNECT_NODE_URL
54+
// }
55+
// }
56+
// }
57+
// }
58+
fun getBaseUrl(): String = BuildConfig.RUNNECT_PROD_URL
5759
}
5860
}

app/src/main/java/com/runnect/runnect/presentation/run/RunActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class RunActivity : BindingActivity<ActivityRunBinding>(R.layout.activity_run),
124124
override fun onStart() {
125125
super.onStart()
126126
// Timer 결과값을 받기 위해 브로드캐스트 리시버 등록
127-
registerReceiver(timerReceiver, IntentFilter(TIMER_UPDATE_ACTION))
127+
registerReceiver(timerReceiver, IntentFilter(TIMER_UPDATE_ACTION), RECEIVER_NOT_EXPORTED)
128128
}
129129

130130
override fun onStop() {

app/src/main/java/com/runnect/runnect/presentation/run/TimerService.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class TimerService : Service() {
7373
second = second
7474
)
7575
)
76+
intent.setPackage(packageName)
7677
sendBroadcast(intent)
7778

7879
// 알림의 내용 업데이트

0 commit comments

Comments
 (0)