toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix Application Not Responding (ANR) executing service android (#1319)

Browse source
This commit is contained in:
enahum 2017-12-22 16:10:38 -03:00 committed by GitHub
parent eb214ab1d8
commit 7a1e6d03da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/mattermost.js
View file

@ -165,6 +165,7 @@ export default class Mattermost {
popInitialNotification: true,
requestPermissions: true
});
this.isConfigured = true;
};
handleAppStateChange = async (appState) => {
@ -424,7 +425,6 @@ export default class Mattermost {
} else if (isNotActive) {
// for IOS replying from push notification starts the app in the background
this.shouldRelaunchonActive = true;
this.configurePushNotifications();
this.startFakeApp();
} else {
this.launchApp();
@ -433,6 +433,7 @@ export default class Mattermost {
};
onRegisterDevice = (data) => {
this.isConfigured = true;
const {dispatch, getState} = this.store;
let prefix;
if (Platform.OS === 'ios') {
@ -445,7 +446,6 @@ export default class Mattermost {
}
setDeviceToken(`${prefix}:${data.token}`)(dispatch, getState);
this.isConfigured = true;
};
onPushNotification = (deviceNotification) => {

14
app/push_notifications/push_notifications.android.js
View file

@ -11,6 +11,11 @@ class PushNotification {
this.onNotification = null;
this.onReply = null;
this.deviceNotification = null;
this.deviceToken = null;
NotificationsAndroid.setRegistrationTokenUpdateListener((deviceToken) => {
this.deviceToken = deviceToken;
});
NotificationsAndroid.setNotificationReceivedListener((notification) => {
if (notification) {
@ -61,12 +66,9 @@ class PushNotification {
this.onNotification = options.onNotification;
this.onReply = options.onReply;
NotificationsAndroid.refreshToken();
NotificationsAndroid.setRegistrationTokenUpdateListener((deviceToken) => {
if (this.onRegister) {
this.onRegister({token: deviceToken});
}
});
if (this.onRegister && this.deviceToken) {
this.onRegister({token: this.deviceToken});
}
if (options.popInitialNotification) {
PendingNotifications.getInitialNotification().