From c1f453d295a6417237d0cdd3b09337e4d60c4b1d Mon Sep 17 00:00:00 2001 From: Son Myeongji Date: Wed, 3 Apr 2024 19:08:35 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=EB=84=A4=ED=8A=B8=EC=9B=8C?= =?UTF-8?q?=ED=81=AC=20=ED=86=B5=EC=8B=A0=20=EC=8B=9C=EA=B0=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/youdongknowme/standard/network/RetrofitObject.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 72d38e3a..de816d56 100644 --- 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 -> From 94fc9feca2af89ef2184234465fff85caf5121cc Mon Sep 17 00:00:00 2001 From: Son Myeongji Date: Wed, 3 Apr 2024 19:11:37 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor=20:=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/setting/OnboardingPermissionActivity.kt | 2 +- .../view/setting/{dialog_permission.kt => PermissionDialog.kt} | 2 +- .../android/youdongknowme/ui/view/setting/SettingFragment.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/{dialog_permission.kt => PermissionDialog.kt} (96%) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt index eb044036..39b608e5 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt +++ b/app/src/main/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/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/dialog_permission.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt similarity index 96% rename from app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/dialog_permission.kt rename to app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/PermissionDialog.kt index 8f7fb713..dc0dc142 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/dialog_permission.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/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 index 64f1223c..ddce2a0d 100644 --- 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 @@ -129,7 +129,7 @@ class SettingFragment : BaseFragment() 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") } } From 4b74fcad09ea030192a3cd7358aff5b231540037 Mon Sep 17 00:00:00 2001 From: Son Myeongji Date: Thu, 4 Apr 2024 19:13:48 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20FCM=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dongyang/android/youdongknowme/service/FCMService.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index f5868b29..eabe18d8 100644 --- 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 ) }