LBRYCommunity/lbryinc
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

include if sync data has changed in response callback #88

Merged
neb-b merged 1 commit from changed-callback into master 2020-03-19 18:50:38 +01:00
Conversation 0 Commits 1 Files changed 3 +15 -12
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dist/bundle.es.js vendored
View file

@ -2636,13 +2636,13 @@ function doSetSync(oldHash, newHash, data) {
function doGetSync(passedPassword, callback) {
const password = passedPassword === null || passedPassword === undefined ? '' : passedPassword;
function handleCallback(error) {
function handleCallback(error, hasNewData) {
if (callback) {
if (typeof callback !== 'function') {
throw new Error('Second argument passed to "doGetSync" must be a function');
}
callback(error);
callback(error, hasNewData);
}
}
@ -2673,6 +2673,7 @@ function doGetSync(passedPassword, callback) {
const syncHash = response.hash;
data.syncHash = syncHash;
data.syncData = response.data;
data.changed = response.changed;
data.hasSyncedWallet = true;
if (response.changed) {
@ -2688,7 +2689,7 @@ function doGetSync(passedPassword, callback) {
type: GET_SYNC_COMPLETED,
data
});
handleCallback();
handleCallback(null, data.changed);
return;
}
@ -2706,7 +2707,7 @@ function doGetSync(passedPassword, callback) {
type: GET_SYNC_COMPLETED,
data
});
handleCallback();
handleCallback(null, data.changed);
}).catch(syncAttemptError => {
if (data.unlockFailed) {
dispatch({

9
dist/bundle.js vendored
View file

@ -6412,13 +6412,13 @@ function doSetSync(oldHash, newHash, data) {
function doGetSync(passedPassword, callback) {
var password = passedPassword === null || passedPassword === undefined ? '' : passedPassword;
function handleCallback(error) {
function handleCallback(error, hasNewData) {
if (callback) {
if (typeof callback !== 'function') {
throw new Error('Second argument passed to "doGetSync" must be a function');
}
callback(error);
callback(error, hasNewData);
}
}
@ -6451,6 +6451,7 @@ function doGetSync(passedPassword, callback) {
var syncHash = response.hash;
data.syncHash = syncHash;
data.syncData = response.data;
data.changed = response.changed;
data.hasSyncedWallet = true;
if (response.changed) {
@ -6466,7 +6467,7 @@ function doGetSync(passedPassword, callback) {
type: constants_action_types__WEBPACK_IMPORTED_MODULE_0__["GET_SYNC_COMPLETED"],
data: data
});
handleCallback();
handleCallback(null, data.changed);
return;
}
@ -6482,7 +6483,7 @@ function doGetSync(passedPassword, callback) {
type: constants_action_types__WEBPACK_IMPORTED_MODULE_0__["GET_SYNC_COMPLETED"],
data: data
});
handleCallback();
handleCallback(null, data.changed);
})["catch"](function (syncAttemptError) {
if (data.unlockFailed) {
dispatch({

9
src/redux/actions/sync.js
View file

@ -80,13 +80,13 @@ export function doSetSync(oldHash, newHash, data) {
export function doGetSync(passedPassword, callback) {
const password = passedPassword === null || passedPassword === undefined ? '' : passedPassword;
function handleCallback(error) {
function handleCallback(error, hasNewData) {
if (callback) {
if (typeof callback !== 'function') {
throw new Error('Second argument passed to "doGetSync" must be a function');
}
callback(error);
callback(error, hasNewData);
}
}
@ -118,6 +118,7 @@ export function doGetSync(passedPassword, callback) {
const syncHash = response.hash;
data.syncHash = syncHash;
data.syncData = response.data;
data.changed = response.changed;
data.hasSyncedWallet = true;
if (response.changed) {
@ -127,7 +128,7 @@ export function doGetSync(passedPassword, callback) {
.then(response => {
if (!response) {
dispatch({ type: ACTIONS.GET_SYNC_COMPLETED, data });
handleCallback();
handleCallback(null, data.changed);
return;
}
@ -139,7 +140,7 @@ export function doGetSync(passedPassword, callback) {
}
dispatch({ type: ACTIONS.GET_SYNC_COMPLETED, data });
handleCallback();
handleCallback(null, data.changed);
})
.catch(syncAttemptError => {
if (data.unlockFailed) {