Skip to content

Commit d417357

Browse files
author
Devendra
committed
adding cipher support for titanium
1 parent 0f0aa6b commit d417357

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

titanium/pubnub.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ function PN_API(setup) {
219219
, STATE = {}
220220
, PRESENCE_HB_TIMEOUT = null
221221
, PRESENCE_HB = validate_presence_heartbeat(setup['heartbeat'] || setup['pnexpires'] || 0, setup['error'])
222-
, PRESENCE_HB_INTERVAL = PRESENCE_HB - 3
222+
, PRESENCE_HB_INTERVAL = setup['heartbeat_interval'] || PRESENCE_HB - 3
223223
, PRESENCE_HB_RUNNING = false
224224
, NO_WAIT_FOR_PENDING = setup['no_wait_for_pending']
225225
, xdr = setup['xdr']
@@ -485,7 +485,7 @@ function PN_API(setup) {
485485
destination : 'new_channel'
486486
});
487487
*/
488-
'replay' : function(args) {
488+
'replay' : function(args, callback) {
489489
var callback = callback || args['callback'] || function(){}
490490
, auth_key = args['auth_key'] || AUTH_KEY
491491
, source = args['source']
@@ -910,7 +910,7 @@ function PN_API(setup) {
910910
, auth_key = args['auth_key'] || AUTH_KEY
911911
, channel = args['channel']
912912
, jsonp = jsonp_cb()
913-
, uuids = args['uuids'] || true
913+
, uuids = ('uuids' in args) ? args['uuids'] : true
914914
, state = args['state']
915915
, data = { 'uuid' : UUID, 'auth' : auth_key };
916916

@@ -2708,6 +2708,7 @@ function CREATE_PUBNUB(setup) {
27082708

27092709
setup['db'] = db;
27102710
setup['xdr'] = setup['native_tcp_socket'] ? xdr_tcp : xdr_http_client
2711+
setup['crypto_obj'] = crypto_obj();
27112712

27122713

27132714
SELF = function(setup) {

titanium/unassembled/platform.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ function CREATE_PUBNUB(setup) {
270270

271271
setup['db'] = db;
272272
setup['xdr'] = setup['native_tcp_socket'] ? xdr_tcp : xdr_http_client
273+
setup['crypto_obj'] = crypto_obj();
273274

274275

275276
SELF = function(setup) {

0 commit comments

Comments
 (0)