Skip to content

Commit 2ecc047

Browse files
committed
#235 [FIX] kakao_social_account_login
카카오 소셜 계정 수정
1 parent 228903c commit 2ecc047

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

app/src/main/AndroidManifest.xml

+4
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
<activity android:name=".presentation.ui.alarm.AlarmActivity" />
6868
<activity
6969
android:name=".presentation.ui.main.SplashActivity"
70+
android:exported="true"/>
71+
72+
<activity
73+
android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
7074
android:exported="true">
7175
<intent-filter>
7276
<action android:name="android.intent.action.VIEW" />

app/src/main/java/com/example/charo_android/presentation/ui/main/MainActivity.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ class MainActivity : AppCompatActivity() {
7575
false -> replaceCharoFragment(otherUserEmail!!, otherUserNickname!!, isMyPage)
7676
}
7777
}
78-
false -> replaceHomeFragment(userEmail, nickName)
78+
false -> replaceHomeFragment(userEmail, nickName)
7979
}
8080
initNavView()
8181
lookFor()
8282

8383
}
8484

85-
override fun onBackPressed() {
85+
override fun onBackPressed() {
8686
finish()
8787
}
8888

@@ -99,7 +99,6 @@ class MainActivity : AppCompatActivity() {
9999
R.id.navigation_home -> {
100100
parameters.putString(FirebaseAnalytics.Param.ITEM_NAME, getString(R.string.title_home_kor))
101101
analytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, parameters)
102-
103102
replaceHomeFragment(userEmail, nickName)
104103
return@setOnItemSelectedListener true
105104
}

buildSrc/build/source-roots/buildSrc/source-roots.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
src\main\resources
32
src\main\java
43
src\main\groovy

0 commit comments

Comments
 (0)