Skip to content

Commit 0af3516

Browse files
committed
[REFACTOR] #339 applicationContext -> context로 변경하고, null 안전하게 체크
1 parent e9c245b commit 0af3516

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
4444
}
4545

4646
private fun checkVisitorMode() {
47-
val accessToken = applicationContext.getAccessToken()
47+
val accessToken = this.getAccessToken()
4848
val loginStatus = LoginStatus.getLoginStatus(accessToken)
4949
isVisitorMode = loginStatus == LoginStatus.VISITOR
5050
}

app/src/main/java/com/runnect/runnect/presentation/login/GiveNicknameActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class GiveNicknameActivity :
3535
}
3636

3737
private fun saveSignTokenInfo() {
38-
applicationContext.saveToken(
38+
this.saveToken(
3939
accessToken = intent.getStringExtra("access") ?: "",
4040
refreshToken = intent.getStringExtra("refresh") ?: ""
4141
)

app/src/main/java/com/runnect/runnect/presentation/login/LoginActivity.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.runnect.runnect.presentation.login
22

33
import android.content.ContentValues
4+
import android.content.Context
45
import android.content.Intent
56
import android.os.Bundle
67
import android.widget.Toast
@@ -32,7 +33,7 @@ class LoginActivity :
3233
//자동 로그인
3334
override fun onStart() {
3435
super.onStart()
35-
val accessToken = applicationContext.getAccessToken()
36+
val accessToken = this.getAccessToken()
3637

3738
when (LoginStatus.getLoginStatus(accessToken)) {
3839
LoginStatus.EXPIRED -> {
@@ -67,6 +68,7 @@ class LoginActivity :
6768
}
6869

6970
private fun addListener() {
71+
val ctx: Context = this
7072
with(binding) {
7173
cvGoogleLogin.setOnClickListener {
7274
socialLogin = googleLogin
@@ -78,7 +80,7 @@ class LoginActivity :
7880
}
7981
btnVisitorMode.setOnClickListener {
8082
Analytics.logClickedItemEvent(EVENT_CLICK_VISITOR)
81-
applicationContext.saveToken(
83+
ctx.saveToken(
8284
accessToken = LoginStatus.VISITOR.value,
8385
refreshToken = LoginStatus.VISITOR.value
8486
)
@@ -130,7 +132,7 @@ class LoginActivity :
130132

131133
private fun saveSignTokenInfo() {
132134
viewModel.loginResult.value?.let { loginResult ->
133-
applicationContext.saveToken(
135+
this.saveToken(
134136
accessToken = loginResult.accessToken,
135137
refreshToken = loginResult.refreshToken
136138
)

app/src/main/java/com/runnect/runnect/presentation/mypage/setting/accountinfo/MySettingAccountInfoFragment.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.runnect.runnect.presentation.mypage.setting.accountinfo
22

33
import android.app.AlertDialog
44
import android.content.ContentValues
5+
import android.content.Context
56
import android.content.Intent
67
import android.os.Bundle
78
import android.view.View
@@ -111,7 +112,8 @@ class MySettingAccountInfoFragment :
111112
}
112113

113114
private fun moveToLogin() {
114-
requireActivity().applicationContext?.saveToken(
115+
val ctx: Context = context ?: return
116+
ctx.saveToken(
115117
accessToken = LoginStatus.NONE.value,
116118
refreshToken = LoginStatus.NONE.value
117119
)

0 commit comments

Comments
 (0)