diff --git a/app/src/main/java/com/runnect/runnect/application/ApplicationClass.kt b/app/src/main/java/com/runnect/runnect/application/ApplicationClass.kt index e55858e3..9e2a9d46 100644 --- a/app/src/main/java/com/runnect/runnect/application/ApplicationClass.kt +++ b/app/src/main/java/com/runnect/runnect/application/ApplicationClass.kt @@ -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 } } diff --git a/app/src/main/java/com/runnect/runnect/presentation/run/RunActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/run/RunActivity.kt index ceeea8f9..62dc71d0 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/run/RunActivity.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/run/RunActivity.kt @@ -124,7 +124,7 @@ class RunActivity : BindingActivity(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() { diff --git a/app/src/main/java/com/runnect/runnect/presentation/run/TimerService.kt b/app/src/main/java/com/runnect/runnect/presentation/run/TimerService.kt index e8037b74..3549c2dd 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/run/TimerService.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/run/TimerService.kt @@ -73,6 +73,7 @@ class TimerService : Service() { second = second ) ) + intent.setPackage(packageName) sendBroadcast(intent) // 알림의 내용 업데이트