Skip to content

Commit

Permalink
fix(android): get token for every register
Browse files Browse the repository at this point in the history 
Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
  • Loading branch information
@90dy
90dy committed Jan 24, 2019
1 parent 6e813e5 commit 51057f8
Show file tree
Hide file tree
Showing 2 changed files with 169 additions and 94 deletions.
3 changes: 2 additions & 1 deletion ...act-native/android/app/src/main/java/chat/berty/core/notification/NotificationNative.java
View file
Expand Up @@ -57,7 +57,8 @@ public void register() throws Exception {

this.askPermissions();
FirebaseInstanceId.getInstance().getInstanceId();
FirebaseInstanceId.getInstance().getToken(authorizedEntity, "FCM");
String token = FirebaseInstanceId.getInstance().getToken(authorizedEntity, "FCM");
gomobile.receiveFCMToken(token.getBytes());
}

public void unregister() throws Exception {
Expand Down
260 changes: 167 additions & 93 deletions client/react-native/common/components/Screens/Settings/Notifications.js
View file
Expand Up @@ -5,84 +5,149 @@ import I18n from 'i18next'
import { withNamespaces } from 'react-i18next'
import { QueryReducer, RelayContext } from '../../../relay'
import { merge } from '../../../helpers'
import { enableNativeNotifications, disableNativeNotifications, getNativePushType, enableMQTTNotifications, disableMQTTNotifications } from '../../../helpers/notifications'
import {
enableNativeNotifications,
disableNativeNotifications,
getNativePushType,
enableMQTTNotifications,
disableMQTTNotifications,
} from '../../../helpers/notifications'
import { enums } from '../../../graphql'

const dummyPubKey = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1wyoWXdQZeaQoOKvC2YRwR3+GTb8prpMFNdOmhikU8eionUBKgKnUyIbr/DTvCJQhTlHZfy1pUL6mmRIk9PDQDO1t4ATY9LXfo/O3KoKJ0GmxhGdjheOf1kiKcrem+MJjBVEriZ7tJvuhA/DztQ1zolvflPz9+aNL1qA6qzJD/m2fNYpfEehtZH37MoN/qcn3THnC8H/wwr6soU5GpdPBiXXKcg1IFiaZX9JAoUzKVyzY1xQ/DOzCYCboPSXh1qSsMFsg2LCAmC56s9czKk7foAOV/WZ3Zzbv6yd74K6TdV0xwMgCctZjNa7/Tbq4pCBK2vEMutSXAJlfo+6K9dLQQIDAQAB'
const dummyPubKey =
'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1wyoWXdQZeaQoOKvC2YRwR3+GTb8prpMFNdOmhikU8eionUBKgKnUyIbr/DTvCJQhTlHZfy1pUL6mmRIk9PDQDO1t4ATY9LXfo/O3KoKJ0GmxhGdjheOf1kiKcrem+MJjBVEriZ7tJvuhA/DztQ1zolvflPz9+aNL1qA6qzJD/m2fNYpfEehtZH37MoN/qcn3THnC8H/wwr6soU5GpdPBiXXKcg1IFiaZX9JAoUzKVyzY1xQ/DOzCYCboPSXh1qSsMFsg2LCAmC56s9czKk7foAOV/WZ3Zzbv6yd74K6TdV0xwMgCctZjNa7/Tbq4pCBK2vEMutSXAJlfo+6K9dLQQIDAQAB'
const dummyPushId = 'dummy-push-id'

class NotificationsBase extends PureComponent {
getCurrentPushConfigs = () =>
this.props.data.filter(elt => elt.pushType === getNativePushType())

getCurrentMQTTConfigs = () =>
this.props.data.filter(
elt =>
elt.pushType === enums.BertyPushDevicePushTypeInputDevicePushType.MQTT
)

state = {
pushConfigsSwitch: this.getCurrentPushConfigs().length > 0,
mqttConfigsSwitch: this.getCurrentMQTTConfigs().length > 0,
}

render () {
const { t, data, context } = this.props
const { t, context } = this.props
const nativePushType = getNativePushType()
const currentPushConfigs = data.filter(elt => elt.pushType === nativePushType)
const currentMQTTConfigs = data.filter(elt => elt.pushType === enums.BertyPushDevicePushTypeInputDevicePushType.MQTT)
const currentMQTTConfigs = this.getCurrentMQTTConfigs()
const { pushConfigsSwitch, mqttConfigsSwitch } = this.state

return (
<Menu>
<Menu.Section title={t('settings.notifications-transport')}>
{Platform.OS !== 'web' && nativePushType === enums.BertyPushDevicePushTypeInputDevicePushType.UnknownDevicePushType && <Menu.Item title={t('settings.push-transport-not-supported')} />}
{nativePushType !== enums.BertyPushDevicePushTypeInputDevicePushType.UnknownDevicePushType && <Menu.Item
title={
(nativePushType === enums.BertyPushDevicePushTypeInputDevicePushType.APNS ? t('settings.push-berty-apple-servers') : '') +
(nativePushType === enums.BertyPushDevicePushTypeInputDevicePushType.FCM ? t('settings.push-berty-google-firebase-servers') : '')
}
left
customRight={
<Switch
justify='end'
disabled={false}
value={currentPushConfigs.length > 0}
onValueChange={async value => {
value
? enableNativeNotifications({ context })
: disableNativeNotifications({ context })
await this.props.refresh()
}}
/>
}
/> }
{Platform.OS === 'web' && <Menu.Item
title={t('settings.push-mqtt-berty-servers')}
customRight={
<Switch
justify='end'
disabled={false}
value={currentMQTTConfigs.length > 0}
onValueChange={async value => {
value
? enableMQTTNotifications({ context, relayPubkey: dummyPubKey, pushId: dummyPushId })
: disableMQTTNotifications({ context, currentPushConfigs: currentMQTTConfigs })
await this.props.refresh()
}}
/>
} />}
{Platform.OS !== 'web' &&
nativePushType ===
enums.BertyPushDevicePushTypeInputDevicePushType
.UnknownDevicePushType && (
<Menu.Item title={t('settings.push-transport-not-supported')} />
)}
{nativePushType !==
enums.BertyPushDevicePushTypeInputDevicePushType
.UnknownDevicePushType && (
<Menu.Item
title={
(nativePushType ===
enums.BertyPushDevicePushTypeInputDevicePushType.APNS
? t('settings.push-berty-apple-servers')
: '') +
(nativePushType ===
enums.BertyPushDevicePushTypeInputDevicePushType.FCM
? t('settings.push-berty-google-firebase-servers')
: '')
}
left
customRight={
<Switch
justify='end'
disabled={false}
value={pushConfigsSwitch}
onValueChange={async value =>
this.setState(
{
pushConfigsSwitch: value,
},
async () => {
try {
value
? await enableNativeNotifications({ context })
: await disableNativeNotifications({ context })
this.props.refresh()
} catch (err) {
this.setState({
pushConfigsSwitch:
this.getCurrentPushConfigs().length > 0,
})
}
}
)
}
/>
}
/>
)}
{Platform.OS === 'web' && (
<Menu.Item
title={t('settings.push-mqtt-berty-servers')}
customRight={
<Switch
justify='end'
disabled={false}
value={mqttConfigsSwitch}
onValueChange={value =>
this.setState(
{
mqttConfigsSwitch: value,
},
async () => {
try {
value
? await enableMQTTNotifications({
context,
relayPubkey: dummyPubKey,
pushId: dummyPushId,
})
: await disableMQTTNotifications({
context,
currentPushConfigs: currentMQTTConfigs,
})
this.props.refresh()
} catch (err) {
this.setState({
mqttConfigsSwitch:
this.getCurrentPushConfigs().length > 0,
})
}
}
)
}
/>
}
/>
)}
</Menu.Section>
<Menu.Section title={t('settings.notifications-alerts')}>
<Menu.Item
title={t('chats.notifications-enabled')}
left
customRight={
<Switch
justify='end'
disabled={false}
value
/>
}
customRight={<Switch justify='end' disabled={false} value />}
/>
<Menu.Item
title={t('chats.notifications-preview')}
left
customRight={
<Switch
justify='end'
disabled={false}
value
/>
}
customRight={<Switch justify='end' disabled={false} value />}
/>
<Menu.Item
title={t('chats.notifications-sound')}
textRight='Paulette'
left
/>
<Menu.Item title={t('chats.notifications-sound')}
textRight='Paulette' left />
</Menu.Section>
</Menu>
)
Expand All @@ -91,47 +156,56 @@ class NotificationsBase extends PureComponent {

export default class NotificationWrapper extends React.PureComponent {
static navigationOptions = ({ navigation }) => ({
header: <Header navigation={navigation}
title={I18n.t('chats.notifications')} backBtn />,
header: (
<Header
navigation={navigation}
title={I18n.t('chats.notifications')}
backBtn
/>
),
})

render () {
const props = this.props

return <RelayContext.Consumer>
{(context) => <QueryReducer
query={context.queries.DevicePushConfigList.graphql}
variables={merge([
context.queries.DevicePushConfigList.defaultVariables,
])}
>
{(state, retry) => {
switch (state.type) {
default:
case state.loading:
return (
<Flex.Rows align='center'>
<Flex.Cols align='center'>
<ActivityIndicator size='large' />
</Flex.Cols>
</Flex.Rows>
)
case state.success:
return (
<Notifications
data={state.data.DevicePushConfigList.edges}
context={context}
refresh={retry}
{...props}
/>
)
case state.error:
setTimeout(() => retry(), 1000)
return null
}
}}
</QueryReducer>}
</RelayContext.Consumer>
return (
<RelayContext.Consumer>
{context => (
<QueryReducer
query={context.queries.DevicePushConfigList.graphql}
variables={merge([
context.queries.DevicePushConfigList.defaultVariables,
])}
>
{(state, retry) => {
switch (state.type) {
default:
case state.loading:
return (
<Flex.Rows align='center'>
<Flex.Cols align='center'>
<ActivityIndicator size='large' />
</Flex.Cols>
</Flex.Rows>
)
case state.success:
return (
<Notifications
data={state.data.DevicePushConfigList.edges}
context={context}
refresh={retry}
{...props}
/>
)
case state.error:
setTimeout(() => retry(), 1000)
return null
}
}}
</QueryReducer>
)}
</RelayContext.Consumer>
)
}
}

Expand Down

0 comments on commit 51057f8

Please sign in to comment.