Merge pull request #232 from TeamDMU/feature/second-qa-mj

�Feat : 2차 QA 반영
TeamDMU · Apr 4, 2024 · 9a0d46c · 9a0d46c
2 parents 09f243c + 1847444
commit 9a0d46c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/service/FCMService.kt b/app/src/main/java/com/dongyang/android/youdongknowme/service/FCMService.kt
@@ -57,15 +57,15 @@ class FCMService : FirebaseMessagingService() {
         val pendingIntent = if (detailIntent != null) {
             TaskStackBuilder.create(this).run {
                 addNextIntent(mainIntent)
-                addNextIntentWithParentStack(detailIntent) // DetailActivity를 부모 스택으로 추가
-                getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
+                addNextIntentWithParentStack(detailIntent)
+                getPendingIntent(0, PendingIntent.FLAG_IMMUTABLE)
             }
         } else {
             PendingIntent.getActivity(
                 this,
                 0,
                 mainIntent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+                PendingIntent.FLAG_IMMUTABLE
             )
         }
 

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/network/RetrofitObject.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/network/RetrofitObject.kt
@@ -9,7 +9,7 @@ import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 object RetrofitObject {
-    private const val TIME_OUT_COUNT: Long = 30
+    private const val TIME_OUT_COUNT: Long = 40
 
     fun getNetwork(): Retrofit {
         val baseInterceptor = Interceptor { chain ->

diff --git a/...n/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt b/...n/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
@@ -49,7 +49,7 @@ class OnboardingPermissionActivity :
                 } else {
 
                     // 알림 권한이 미허용 상태
-                    val dialog = DialogPermission(getString(R.string.dialog_permission_title), getString(R.string.dialog_permission_content), this.packageName)
+                    val dialog = PermissionDialog(getString(R.string.dialog_permission_title), getString(R.string.dialog_permission_content), this.packageName)
                     dialog.show(supportFragmentManager, "CustomDialog")
                 }
             } else {

diff --git a/...owme/ui/view/setting/dialog_permission.kt → ...nowme/ui/view/setting/PermissionDialog.kt b/...owme/ui/view/setting/dialog_permission.kt → ...nowme/ui/view/setting/PermissionDialog.kt
@@ -12,7 +12,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import com.dongyang.android.youdongknowme.databinding.DialogPermissionBinding
 
-class DialogPermission(val title: String, val content: String, val pacakageName: String) : DialogFragment() {
+class PermissionDialog(val title: String, val content: String, val pacakageName: String) : DialogFragment() {
     private var _binding: DialogPermissionBinding? = null
     private val binding get() = _binding!!
 

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -133,7 +133,7 @@ class SettingFragment : BaseFragment<FragmentSettingBinding, SettingViewModel>()
                 binding.switchSettingUniversityAlarm.isChecked = false
                 binding.switchSettingDepartmentAlarm.isChecked = false
 
-                val dialog = DialogPermission(getString(R.string.dialog_permission_title), getString(R.string.dialog_permission_content), requireContext().packageName)
+                val dialog = PermissionDialog(getString(R.string.dialog_permission_title), getString(R.string.dialog_permission_content), requireContext().packageName)
                 dialog.show(parentFragmentManager, "CustomDialog")
             } else {
                 switch.isChecked = !switch.isChecked