Merge pull request #254 from tukcomCD2024/android_al

Android
tukcomCD2024 · Jun 20, 2024 · 46b7e27 · 46b7e27
2 parents 2c93f6d + b89c642
commit 46b7e27
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/android/app/src/main/java/com/example/sharenote/HomeFragment.kt b/android/app/src/main/java/com/example/sharenote/HomeFragment.kt
@@ -277,6 +277,7 @@ class HomeFragment : Fragment() {
         val settingLayoutView = popupView.findViewById<RelativeLayout>(R.id.logoutLayout)
         settingLayoutView.setOnClickListener {
             auth.signOut()
+            SharedPreferencesUtil.saveLoggedInStatus(requireContext(), false)
             val loginIntent = Intent(requireContext(), LoginActivity::class.java)
             startActivity(loginIntent)
             requireActivity().finish()

diff --git a/android/app/src/main/java/com/example/sharenote/MyFirebaseMessagingService.kt b/android/app/src/main/java/com/example/sharenote/MyFirebaseMessagingService.kt
@@ -35,7 +35,8 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
         // 알림 클릭 시 실행할 액티비티 설정
         val intent = Intent(this, QuizActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        val pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_UPDATE_CURRENT)
+        intent.putExtra("fromNotification", true)
+        val pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE)
 
         // 알림 생성
         val notificationBuilder = NotificationCompat.Builder(this, "default")

diff --git a/android/app/src/main/java/com/example/sharenote/SplashActivity.kt b/android/app/src/main/java/com/example/sharenote/SplashActivity.kt
@@ -8,7 +8,6 @@ import androidx.appcompat.app.AppCompatActivity
 
 class SplashActivity : AppCompatActivity() {
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_splash)
@@ -17,11 +16,19 @@ class SplashActivity : AppCompatActivity() {
         supportActionBar?.hide()
 
         val handler = Handler(Looper.getMainLooper())
-        handler.postDelayed(Runnable {
-            Intent(this, LoginActivity::class.java).apply {
-                startActivity(this)
-                finish()
+        handler.postDelayed({
+            val targetActivity = if (intent.getBooleanExtra("fromNotification", false)) {
+                QuizActivity::class.java
+            } else {
+                if (SharedPreferencesUtil.isLoggedIn(this)) {
+                    MainActivity::class.java
+                } else {
+                    LoginActivity::class.java
+                }
             }
+            val nextIntent = Intent(this, targetActivity)
+            startActivity(nextIntent)
+            finish()
         }, 3000) // 3초 후(3000) 스플래시 화면을 닫습니다
     }
-}
+}