@ -201,39 +201,24 @@
this . sendSyncMessage ( ) ;
this . sendSyncMessage ( ) ;
} . bind ( this ) ) . catch ( function ( result ) {
} . bind ( this ) ) . catch ( function ( result ) {
var now = Date . now ( ) ;
var now = Date . now ( ) ;
var errors ;
var conversation = this . getConversation ( ) ;
this . trigger ( 'done' ) ;
this . trigger ( 'done' ) ;
if ( result . dataMessage ) {
if ( result . dataMessage ) {
this . set ( { dataMessage : result . dataMessage } ) ;
this . set ( { dataMessage : result . dataMessage } ) ;
}
}
if ( result instanceof Error ) {
if ( result instanceof Error ) {
errors = [ result ] ;
this . saveErrors ( result ) ;
this . saveErrors ( errors ) ;
if ( result . name === 'SignedPreKeyRotationError' ) {
if ( result . name === 'SignedPreKeyRotationError' ) {
getAccountManager ( ) . rotateSignedPreKey ( ) ;
getAccountManager ( ) . rotateSignedPreKey ( ) ;
}
}
} else {
} else {
errors = result . errors ;
this . saveErrors ( result . errors ) ;
this . saveErrors ( errors ) ;
if ( result . successfulNumbers . length > 0 ) {
if ( result . successfulNumbers . length > 0 ) {
this . set ( { sent : true , expirationStartTimestamp : now } ) ;
this . set ( { sent : true , expirationStartTimestamp : now } ) ;
this . sendSyncMessage ( ) ;
this . sendSyncMessage ( ) ;
}
}
}
}
if ( conversation . get ( 'type' ) === 'group' ) {
errors . forEach ( function ( e ) {
if ( e . name === 'UnregisteredUserError' ) {
textsecure . storage . groups . removeNumber ( conversation . id , e . number ) ;
conversation . addMemberLeft ( e . number ) ;
conversation . set ( {
members : _ . without ( conversation . get ( 'members' ) , e . number )
} ) ;
}
} ) ;
}
} . bind ( this ) ) ;
} . bind ( this ) ) ;
} ,
} ,