octo/tooot
octo
/
tooot
mirror of https://github.com/tooot-app/app
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Now fix push not available 

Because expo-application is not installed
This commit is contained in:
Zhiyuan Zheng 2022-05-15 00:40:49 +02:00
parent de495d26d7
commit 265db6abce
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/screens/Tabs/Me/Push.tsx
View File

@ -4,7 +4,7 @@ import Icon from '@components/Icon'
import { MenuContainer, MenuRow } from '@components/Menu' import { MenuContainer, MenuRow } from '@components/Menu'
import CustomText from '@components/Text' import CustomText from '@components/Text'
import { useAppDispatch } from '@root/store' import { useAppDispatch } from '@root/store'
import { isDevelopment, isRelease } from '@utils/checkEnvironment' import { isDevelopment } from '@utils/checkEnvironment'
import { updateInstancePush } from '@utils/slices/instances/updatePush' import { updateInstancePush } from '@utils/slices/instances/updatePush'
import { updateInstancePushAlert } from '@utils/slices/instances/updatePushAlert' import { updateInstancePushAlert } from '@utils/slices/instances/updatePushAlert'
import { updateInstancePushDecode } from '@utils/slices/instances/updatePushDecode' import { updateInstancePushDecode } from '@utils/slices/instances/updatePushDecode'
@ -36,8 +36,7 @@ const TabMePush: React.FC = () => {
const dispatch = useAppDispatch() const dispatch = useAppDispatch()
const instancePush = useSelector(getInstancePush) const instancePush = useSelector(getInstancePush)
const [pushAvailable, setPushAvailable] = const [pushAvailable, setPushAvailable] = useState<boolean>()
useState<Notifications.ExpoPushToken>()
const [pushEnabled, setPushEnabled] = useState<boolean>() const [pushEnabled, setPushEnabled] = useState<boolean>()
const [pushCanAskAgain, setPushCanAskAgain] = useState<boolean>() const [pushCanAskAgain, setPushCanAskAgain] = useState<boolean>()
const checkPush = async () => { const checkPush = async () => {
@ -48,13 +47,14 @@ const TabMePush: React.FC = () => {
} }
useEffect(() => { useEffect(() => {
if (isDevelopment) { if (isDevelopment) {
setPushAvailable({ data: '', type: 'expo' }) setPushAvailable(true)
} else { } else {
Notifications.getExpoPushTokenAsync({ Notifications.getExpoPushTokenAsync({
experienceId: '@xmflsct/tooot' experienceId: '@xmflsct/tooot',
applicationId: 'com.xmflsct.tooot.app'
}) })
.then(data => setPushAvailable(data)) .then(data => setPushAvailable(!!data))
.catch(() => setPushAvailable(undefined)) .catch(() => setPushAvailable(false))
} }
checkPush() checkPush()
@ -190,13 +190,6 @@ const TabMePush: React.FC = () => {
/> />
</MenuContainer> </MenuContainer>
<MenuContainer>{alerts}</MenuContainer> <MenuContainer>{alerts}</MenuContainer>
{!isRelease ? (
<MenuContainer>
<CustomText fontSize='M' style={{ color: colors.primaryDefault }}>
{pushAvailable.data}
</CustomText>
</MenuContainer>
) : null}
</> </>
) : ( ) : (
<View <View

3
src/utils/push/useConnect.ts
View File

@ -25,7 +25,8 @@ const pushUseConnect = ({ t, instances }: Params) => {
? 'DEVELOPMENT_TOKEN_1' ? 'DEVELOPMENT_TOKEN_1'
: ( : (
await Notifications.getExpoPushTokenAsync({ await Notifications.getExpoPushTokenAsync({
experienceId: '@xmflsct/tooot' experienceId: '@xmflsct/tooot',
applicationId: 'com.xmflsct.tooot.app'
}) })
).data ).data

3
src/utils/slices/instances/updatePush.ts
View File

@ -17,7 +17,8 @@ export const updateInstancePush = createAsyncThunk(
? 'DEVELOPMENT_TOKEN_1' ? 'DEVELOPMENT_TOKEN_1'
: ( : (
await Notifications.getExpoPushTokenAsync({ await Notifications.getExpoPushTokenAsync({
experienceId: '@xmflsct/tooot' experienceId: '@xmflsct/tooot',
applicationId: 'com.xmflsct.tooot.app'
}) })
).data ).data

3
src/utils/slices/instances/updatePushDecode.ts
View File

@ -24,7 +24,8 @@ export const updateInstancePushDecode = createAsyncThunk(
? 'DEVELOPMENT_TOKEN_1' ? 'DEVELOPMENT_TOKEN_1'
: ( : (
await Notifications.getExpoPushTokenAsync({ await Notifications.getExpoPushTokenAsync({
experienceId: '@xmflsct/tooot' experienceId: '@xmflsct/tooot',
applicationId: 'com.xmflsct.tooot.app'
}) })
).data ).data