@@ -41,11 +41,11 @@ GCM.prototype.send = function(data, devices) {
41
41
memo . push ( promise ) ;
42
42
return memo ;
43
43
} , [ ] )
44
- return Parse . Promise . when ( promises ) . then ( ( results ) => {
44
+ return Promise . all ( promises ) . then ( ( results ) => {
45
45
let allResults = results . reduce ( ( memo , result ) => {
46
46
return memo . concat ( result ) ;
47
47
} , [ ] ) ;
48
- return Parse . Promise . as ( allResults ) ;
48
+ return Promise . resolve ( allResults ) ;
49
49
} ) ;
50
50
}
51
51
// get the devices back...
@@ -70,8 +70,9 @@ GCM.prototype.send = function(data, devices) {
70
70
} , { } ) ;
71
71
72
72
let deviceTokens = Object . keys ( devicesMap ) ;
73
-
74
- let promises = deviceTokens . map ( ( ) => new Parse . Promise ( ) ) ;
73
+
74
+ const resolvers = [ ] ;
75
+ const promises = deviceTokens . map ( ( ) => new Promise ( resolve => resolvers . push ( resolve ) ) ) ;
75
76
let registrationTokens = deviceTokens ;
76
77
let length = registrationTokens . length ;
77
78
log . verbose ( LOG_PREFIX , `sending to ${ length } ${ length > 1 ? 'devices' : 'device' } ` ) ;
@@ -94,7 +95,7 @@ GCM.prototype.send = function(data, devices) {
94
95
}
95
96
let { results, multicast_id } = response || { } ;
96
97
registrationTokens . forEach ( ( token , index ) => {
97
- let promise = promises [ index ] ;
98
+ let resolve = resolvers [ index ] ;
98
99
let result = results ? results [ index ] : undefined ;
99
100
let device = devicesMap [ token ] ;
100
101
device . deviceType = 'android' ;
@@ -108,10 +109,10 @@ GCM.prototype.send = function(data, devices) {
108
109
} else {
109
110
resolution . transmitted = true ;
110
111
}
111
- promise . resolve ( resolution ) ;
112
+ resolve ( resolution ) ;
112
113
} ) ;
113
114
} ) ;
114
- return Parse . Promise . when ( promises ) ;
115
+ return Promise . all ( promises ) ;
115
116
}
116
117
117
118
/**
0 commit comments