update

Author: hyoban

apps/mobile/src/initialize/index.ts

@@ -8,6 +8,7 @@ import { initBackgroundFetch } from "./background"
 import { initCrashlytics } from "./crashlytics"
 import { initializeDayjs } from "./dayjs"
 import { hydrateDatabaseToStore, hydrateQueryClient, hydrateSettings } from "./hydrate"
+import { initMessaging } from "./messaging"
 import { migrateDatabase } from "./migration"
 import { initializePlayer } from "./player"
 
@@ -41,6 +42,7 @@ export const initializeApp = async () => {
     using_indexed_db: true,
   })
   initCrashlytics()
+  initMessaging()
   initBackgroundFetch()
   console.log(`Initialize done,`, `${loadingTime}ms`)
 }

apps/mobile/src/initialize/messaging.ts

@@ -1,56 +1,24 @@
 import messaging from "@react-native-firebase/messaging"
-import * as Device from "expo-device"
-import * as Notifications from "expo-notifications"
-import { Platform } from "react-native"
 
 import { apiClient } from "../lib/api-fetch"
-import { toast } from "../lib/toast"
+import { requestNotificationPermission } from "../lib/permission"
 import { whoami } from "../store/user/getters"
 
-function handleRegistrationError(message: string) {
-  toast.error(message)
-}
-
-async function registerForPushNotificationsAsync() {
-  if (Platform.OS === "android") {
-    Notifications.setNotificationChannelAsync("default", {
-      name: "default",
-      importance: Notifications.AndroidImportance.MAX,
-      vibrationPattern: [0, 250, 250, 250],
-      lightColor: "#FF231F7C",
-    })
-  }
-
-  if (Device.isDevice) {
-    const { status: existingStatus } = await Notifications.getPermissionsAsync()
-    let finalStatus = existingStatus
-    if (existingStatus !== "granted") {
-      const { status } = await Notifications.requestPermissionsAsync()
-      finalStatus = status
-    }
-    if (finalStatus !== "granted") {
-      handleRegistrationError("Permission not granted to get push token for push notification!")
-      return
-    }
-  } else {
-    handleRegistrationError("Must use physical device for push notifications")
-  }
-}
-
 export const initMessaging = () => {
-  const user = whoami()
-  if (!user) {
-    return
-  }
   messaging()
     .getToken()
     .then((token) => {
+      const user = whoami()
+      if (!user) {
+        return
+      }
       apiClient.messaging.$post({
         json: {
           token,
           channel: "mobile",
         },
       })
     })
-  registerForPushNotificationsAsync()
+
+  requestNotificationPermission()
 }

apps/mobile/src/lib/permission.ts

@@ -0,0 +1,35 @@
+import * as Notifications from "expo-notifications"
+import { Platform } from "react-native"
+
+import { toast } from "./toast"
+
+export async function requestNotificationPermission() {
+  if (Platform.OS === "android") {
+    Notifications.setNotificationChannelAsync("default", {
+      name: "default",
+      importance: Notifications.AndroidImportance.MAX,
+      vibrationPattern: [0, 250, 250, 250],
+      lightColor: "#FF231F7C",
+    })
+  }
+
+  const { status: existingStatus } = await Notifications.getPermissionsAsync()
+  let finalStatus = existingStatus
+  if (existingStatus !== "granted") {
+    const { status } = await Notifications.requestPermissionsAsync()
+    finalStatus = status
+  }
+  if (finalStatus !== "granted") {
+    toast.error("Permission not granted for notification!")
+    return false
+  }
+  return true
+}
+
+export async function setBadgeCountAsyncWithPermission(badgeCount: number) {
+  const permissionGranted = await requestNotificationPermission()
+  if (!permissionGranted) {
+    return false
+  }
+  return await Notifications.setBadgeCountAsync(badgeCount)
+}

apps/mobile/src/store/unread/hooks.ts

@@ -1,8 +1,9 @@
 import type { FeedViewType } from "@follow/constants"
 import { useMutation, useQuery } from "@tanstack/react-query"
-import * as Notifications from "expo-notifications"
 import { useCallback, useEffect } from "react"
 
+import { setBadgeCountAsyncWithPermission } from "@/src/lib/permission"
+
 import { useListFeedIds } from "../list/hooks"
 import { useSubscriptionByView } from "../subscription/hooks"
 import { unreadSyncService, useUnreadStore } from "./store"
@@ -27,7 +28,7 @@ export const useAutoMarkAsRead = (entryId: string) => {
 export function useUnreadCountBadge() {
   const unreadCount = useUnreadCounts()
   useEffect(() => {
-    Notifications.setBadgeCountAsync(unreadCount)
+    setBadgeCountAsyncWithPermission(unreadCount)
   }, [unreadCount])
 }
 

apps/mobile/src/store/unread/store.ts

@@ -3,6 +3,7 @@ import * as Notifications from "expo-notifications"
 
 import type { UnreadSchema } from "@/src/database/schemas/types"
 import { apiClient } from "@/src/lib/api-fetch"
+import { setBadgeCountAsyncWithPermission } from "@/src/lib/permission"
 import { EntryService } from "@/src/services/entry"
 import { UnreadService } from "@/src/services/unread"
 
@@ -39,7 +40,7 @@ class UnreadSyncService {
     if (allUnreadCount === currentBadgeCount) {
       return false
     }
-    await Notifications.setBadgeCountAsync(allUnreadCount)
+    setBadgeCountAsyncWithPermission(allUnreadCount)
     return true
   }