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

fix merge conflicts

Browse source
This commit is contained in:
Akinwale Ariwodola 2020-03-17 22:12:41 +01:00
commit 28afb9b06c
3 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dist/bundle.es.js vendored
View file

@ -1275,7 +1275,7 @@ function doFetchInviteStatus() {
});
};
}
function doInstallNew(appVersion, os = null, firebaseToken = null) {
function doInstallNew(appVersion, os = null, firebaseToken = null, callbackForUsersWhoAreSharingData) {
const payload = {
app_version: appVersion
};
@ -1292,6 +1292,10 @@ function doInstallNew(appVersion, os = null, firebaseToken = null) {
payload.operating_system = os || version.os_system;
payload.platform = version.platform;
Lbryio.call('install', 'new', payload);
if (callbackForUsersWhoAreSharingData) {
callbackForUsersWhoAreSharingData(status);
}
});
});
}
@ -1312,7 +1316,7 @@ function doInstallNewWithParams(appVersion, installationId, nodeId, lbrynetVersi
Lbryio.call('install', 'new', payload);
} // TODO: Call doInstallNew separately so we don't have to pass appVersion and os_system params?
function doAuthenticate(appVersion, os = null, firebaseToken = null, callInstall = true) {
function doAuthenticate(appVersion, os = null, firebaseToken = null, shareUsageData = true, callbackForUsersWhoAreSharingData, callInstall = true) {
return dispatch => {
dispatch({
type: AUTHENTICATION_STARTED
@ -1326,11 +1330,14 @@ function doAuthenticate(appVersion, os = null, firebaseToken = null, callInstall
accessToken: token
}
});
dispatch(doRewardList());
dispatch(doFetchInviteStatus());
if (callInstall) {
doInstallNew(appVersion, os, firebaseToken);
if (shareUsageData) {
dispatch(doRewardList());
dispatch(doFetchInviteStatus());
if (callInstall) {
doInstallNew(appVersion, os, firebaseToken, callbackForUsersWhoAreSharingData);
}
}
});
}).catch(error => {

20
dist/bundle.js vendored
View file

@ -4907,6 +4907,7 @@ function doFetchInviteStatus() {
function doInstallNew(appVersion) {
var os = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
var firebaseToken = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
var callbackForUsersWhoAreSharingData = arguments.length > 3 ? arguments[3] : undefined;
var payload = {
app_version: appVersion
};
@ -4923,6 +4924,10 @@ function doInstallNew(appVersion) {
payload.operating_system = os || version.os_system;
payload.platform = version.platform;
lbryio__WEBPACK_IMPORTED_MODULE_5__["default"].call('install', 'new', payload);
if (callbackForUsersWhoAreSharingData) {
callbackForUsersWhoAreSharingData(status);
}
});
});
}
@ -4947,7 +4952,9 @@ function doInstallNewWithParams(appVersion, installationId, nodeId, lbrynetVersi
function doAuthenticate(appVersion) {
var os = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
var firebaseToken = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
var callInstall = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
var shareUsageData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
var callbackForUsersWhoAreSharingData = arguments.length > 4 ? arguments[4] : undefined;
var callInstall = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
return function (dispatch) {
dispatch({
type: constants_action_types__WEBPACK_IMPORTED_MODULE_1__["AUTHENTICATION_STARTED"]
@ -4961,11 +4968,14 @@ function doAuthenticate(appVersion) {
accessToken: token
}
});
dispatch(Object(redux_actions_rewards__WEBPACK_IMPORTED_MODULE_2__["doRewardList"])());
dispatch(doFetchInviteStatus());
if (callInstall) {
doInstallNew(appVersion, os, firebaseToken);
if (shareUsageData) {
dispatch(Object(redux_actions_rewards__WEBPACK_IMPORTED_MODULE_2__["doRewardList"])());
dispatch(doFetchInviteStatus());
if (callInstall) {
doInstallNew(appVersion, os, firebaseToken, callbackForUsersWhoAreSharingData);
}
}
});
})["catch"](function (error) {

30
src/redux/actions/user.js
View file

@ -45,7 +45,12 @@ export function doFetchInviteStatus() {
};
}
export function doInstallNew(appVersion, os = null, firebaseToken = null) {
export function doInstallNew(
appVersion,
os = null,
firebaseToken = null,
callbackForUsersWhoAreSharingData
) {
const payload = { app_version: appVersion };
if (firebaseToken) {
payload.firebase_token = firebaseToken;
@ -59,6 +64,10 @@ export function doInstallNew(appVersion, os = null, firebaseToken = null) {
payload.operating_system = os || version.os_system;
payload.platform = version.platform;
Lbryio.call('install', 'new', payload);
if (callbackForUsersWhoAreSharingData) {
callbackForUsersWhoAreSharingData(status);
}
});
});
}
@ -86,7 +95,14 @@ export function doInstallNewWithParams(
}
// TODO: Call doInstallNew separately so we don't have to pass appVersion and os_system params?
export function doAuthenticate(appVersion, os = null, firebaseToken = null, callInstall = true) {
export function doAuthenticate(
appVersion,
os = null,
firebaseToken = null,
shareUsageData = true,
callbackForUsersWhoAreSharingData,
callInstall = true
) {
return dispatch => {
dispatch({
type: ACTIONS.AUTHENTICATION_STARTED,
@ -100,10 +116,12 @@ export function doAuthenticate(appVersion, os = null, firebaseToken = null, call
data: { user, accessToken: token },
});
dispatch(doRewardList());
dispatch(doFetchInviteStatus());
if (callInstall) {
doInstallNew(appVersion, os, firebaseToken);
if (shareUsageData) {
dispatch(doRewardList());
dispatch(doFetchInviteStatus());
if (callInstall) {
doInstallNew(appVersion, os, firebaseToken, callbackForUsersWhoAreSharingData);
}
}
});
})