Skip to content

RunActivity 타이머 크래시 수정 및 서버 URL prod 고정 #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
unam98 merged 2 commits into from
Apr 3, 2026
+19 −16
Merged

RunActivity 타이머 크래시 수정 및 서버 URL prod 고정 #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8294b7
fix: RunActivity 타이머 브로드캐스트 크래시 및 미수신 수정
unam98 Apr 3, 2026
3000d6b
chore: 디버그 빌드 서버 URL을 prod로 고정
unam98 Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions app/src/main/java/com/runnect/runnect/application/ApplicationClass.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,22 @@ class ApplicationClass : Application() {
lateinit var appContext: Context
const val API_MODE = "API_MODE"

fun getBaseUrl(): String {
return when {
!BuildConfig.DEBUG -> BuildConfig.RUNNECT_PROD_URL
!::appContext.isInitialized -> BuildConfig.RUNNECT_PROD_URL
else -> {
val mode = ApiMode.getCurrentApiMode(appContext)
Timber.d("현재 서버: ${mode}")
when (mode) {
ApiMode.JAVA -> BuildConfig.RUNNECT_PROD_URL
ApiMode.TEST -> BuildConfig.RUNNECT_DEV_URL
else -> BuildConfig.RUNNECT_NODE_URL
}
}
}
}
// TODO: dev/node 서버 복구 시 분기 복원
// fun getBaseUrl(): String {
// return when {
// !BuildConfig.DEBUG -> BuildConfig.RUNNECT_PROD_URL
// !::appContext.isInitialized -> BuildConfig.RUNNECT_PROD_URL
// else -> {
// val mode = ApiMode.getCurrentApiMode(appContext)
// Timber.d("현재 서버: ${mode}")
// when (mode) {
// ApiMode.JAVA -> BuildConfig.RUNNECT_PROD_URL
// ApiMode.TEST -> BuildConfig.RUNNECT_DEV_URL
// else -> BuildConfig.RUNNECT_NODE_URL
// }
// }
// }
// }
fun getBaseUrl(): String = BuildConfig.RUNNECT_PROD_URL
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/runnect/runnect/presentation/run/RunActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class RunActivity : BindingActivity<ActivityRunBinding>(R.layout.activity_run),
override fun onStart() {
super.onStart()
// Timer 결과값을 받기 위해 브로드캐스트 리시버 등록
registerReceiver(timerReceiver, IntentFilter(TIMER_UPDATE_ACTION))
registerReceiver(timerReceiver, IntentFilter(TIMER_UPDATE_ACTION), RECEIVER_NOT_EXPORTED)
}

override fun onStop() {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/runnect/runnect/presentation/run/TimerService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class TimerService : Service() {
second = second
)
)
intent.setPackage(packageName)
sendBroadcast(intent)

// 알림의 내용 업데이트
Expand Down
Loading