Skip to content

Commit e4da2cc

Browse files
committed
fix#199 : fcm 푸시알림 버그 수정
- 릴리즈 빌드시 난독화로 인한 fcm 관련 서비스 객체에서 런타임 에러가 발생했기 때문에 proguard rule 수정했습니다. - 빌드를 위한 버전업 했습니다. - 푸시알림 아이콘에 배경색 추가했습니다.
1 parent 09e16a8 commit e4da2cc

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ android {
3737
applicationId = "com.depromeet.team6"
3838
minSdk = 26
3939
targetSdk = 34
40-
versionCode = 12
41-
versionName = "1.2.1"
40+
versionCode = 13
41+
versionName = "1.2.2"
4242

4343
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4444
buildConfigField("String", "KAKAO_NATIVE_APP_KEY", properties["kakao.native.app.key"].toString())
@@ -48,7 +48,6 @@ android {
4848

4949
buildTypes {
5050
release {
51-
isDebuggable = true
5251
isMinifyEnabled = true
5352
isShrinkResources = true
5453
buildConfigField("String", "BASE_URL", properties["release.base.url"].toString())

app/proguard-rules.pro

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
-keep class com.depromeet.team6.data.datalocal.model.** { *; }
2929
-keep class com.depromeet.team6.domain.model.** { *; }
3030
-keep class com.depromeet.team6.presentation.model.** { *; }
31+
-keep class com.depromeet.team6.data.dataremote.** { *; }
3132

3233
-keepattributes Signature, InnerClasses, EnclosingMethod
3334
-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
@@ -63,16 +64,4 @@
6364
# Optional: if you're using Retrofit + Gson
6465
-keep class retrofit2.** { *; }
6566
-keep class com.google.gson.** { *; }
66-
-keep class okhttp3.** { *; }
67-
68-
# TimeLeftService 관련 클래스 보존
69-
-keep class com.depromeet.team6.**.TimeLeftService { *; }
70-
71-
# Hilt 모듈에 정의된 provides 메서드 클래스 보존
72-
-keep class com.depromeet.team6.di.ServiceModule { *; }
73-
74-
# 모든 @Provides, @Inject 대상 보존
75-
-keepclasseswithmembers class * {
76-
@dagger.** *;
77-
@javax.inject.** *;
78-
}
67+
-keep class okhttp3.** { *; }

app/src/main/java/com/depromeet/team6/data/datalocal/service/FcmService.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ import android.content.Intent
99
import android.os.PowerManager
1010
import android.util.Log
1111
import androidx.annotation.Keep
12+
import androidx.compose.ui.graphics.toArgb
1213
import androidx.core.app.NotificationCompat
1314
import androidx.core.content.ContextCompat
1415
import com.depromeet.team6.R
16+
import com.depromeet.team6.ui.theme.defaultTeam6Colors
1517
import com.google.firebase.messaging.Constants
1618
import com.google.firebase.messaging.FirebaseMessagingService
1719
import com.google.firebase.messaging.RemoteMessage
@@ -106,6 +108,8 @@ class FcmService : FirebaseMessagingService() {
106108
.setContentTitle(title ?: getString(R.string.notification_title_text))
107109
.setContentText(body ?: getString(R.string.notification_body_text))
108110
.setSmallIcon(R.drawable.ic_app_logo_foreground)
111+
.setColor(defaultTeam6Colors.black.toArgb())
112+
.setColorized(true)
109113
.setAutoCancel(true)
110114
.build()
111115

@@ -138,6 +142,8 @@ class FcmService : FirebaseMessagingService() {
138142
.setContentTitle(title ?: getString(R.string.notification_title_text))
139143
.setContentText(body ?: getString(R.string.notification_body_text))
140144
.setSmallIcon(R.drawable.ic_app_logo_foreground)
145+
.setColor(defaultTeam6Colors.black.toArgb())
146+
.setColorized(true)
141147
.setAutoCancel(true)
142148
.setContentIntent(pendingIntent)
143149
.setCategory(Notification.CATEGORY_MESSAGE)
@@ -161,6 +167,8 @@ class FcmService : FirebaseMessagingService() {
161167
.setContentTitle(title)
162168
.setContentText(body)
163169
.setSmallIcon(R.drawable.ic_app_logo_foreground)
170+
.setColor(defaultTeam6Colors.black.toArgb())
171+
.setColorized(true)
164172
.setAutoCancel(true)
165173
.build()
166174

app/src/main/java/com/depromeet/team6/data/repositoryimpl/AuthRepositoryImpl.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ class AuthRepositoryImpl @Inject constructor(
2525
override suspend fun getLogin(provider: Int, fcmToken: String): Result<Auth> =
2626
authRemoteDataSource.getLogin(provider = provider, fcmToken = fcmToken)
2727
.mapCatching {
28-
it.toDomain() }
28+
it.toDomain()
29+
}
2930

3031
override suspend fun postLogout(): Response<Unit> =
3132
authRemoteDataSource.postLogout()

0 commit comments

Comments
 (0)