Compare commits

..
Author SHA1 Message Date
Akinwale Ariwodola 3ddd0b5b50 remove getSync from channel creation success 2019-10-17 13:57:22 +01:00
Akinwale Ariwodola 5d38da2d46 log publish 2019-10-17 13:43:30 +01:00
Akinwale Ariwodola d5f6d494a4 filtered homepage. other updates. 2019-10-17 06:29:50 +01:00
Akinwale Ariwodola 48030a97f2 more updates for release 2019-10-16 17:08:16 +01:00
Akinwale Ariwodola eb12a361b7 sdk calls: account_* -> wallet_* 2019-10-15 23:13:41 +01:00
Akinwale Ariwodola d18ac68e2c merge uri bar suggestions branch 2019-10-15 17:58:27 +01:00
Akinwale Ariwodola a9b7c9590d Merge remote-tracking branch 'origin/master' into rc-0.9.4 2019-10-15 17:56:49 +01:00
Akinwale Ariwodola a8daf84c52 NSFW -> mature 2019-10-15 13:51:33 +01:00
Akinwale Ariwodola b5d9e44445 add URI bar suggestions setting. reorganise settings page 2019-10-15 13:49:29 +01:00
Akinwale Ariwodola 60b0667546 cleanup 2019-10-15 10:27:11 +01:00
Akinwale Ariwodola 194e29356f preference updates. send firebase token. 2019-10-15 10:24:03 +01:00
Akinwale Ariwodola dcbb7f62d6 fix merge conflict 2019-10-15 08:32:39 +01:00
Akinwale Ariwodola 4ac36b0bc7 updates for release 2019-10-15 08:28:37 +01:00
Akinwale Ariwodola b82759c78e Merge remote-tracking branch 'origin/share' into rc-0.9.4 2019-10-11 17:26:06 +01:00
Akinwale Ariwodola 2cb393e6ee fix merge conflicts 2019-10-11 17:25:32 +01:00
Akinwale Ariwodola 79c02825d1 preferences sync and wallet sync updates 2019-10-11 17:12:51 +01:00
Akinwale Ariwodola c85581b98f remove extra slash 2019-10-11 15:17:49 +01:00
Akinwale Ariwodola ae05269417 fix merge conflict 2019-10-11 15:16:05 +01:00
Akinwale Ariwodola 03b321c742 add share button 2019-10-11 15:10:54 +01:00
Akinwale Ariwodola f42cbb90a0 use doPreferenceGet for retrieving saved user state 2019-10-02 10:29:08 +01:00
Akinwale Ariwodola 5eba4ab2ec use shared state subscriber for preferences_set and preferences_get 2019-09-30 22:54:31 +01:00
6 changed files with 42 additions and 56 deletions

No files matched your search

+2 -2
View File
@@ -55,7 +55,7 @@ export default class ModalTagSelector extends React.PureComponent {
return (
<TouchableOpacity style={modalTagSelectorStyle.overlay} activeOpacity={1} onPress={onOverlayPress}>
<TouchableOpacity style={modalTagSelectorStyle.container} activeOpacity={1}>
<View style={modalTagSelectorStyle.container}>
<View style={modalTagSelectorStyle.titleRow}>
<Text style={modalTagSelectorStyle.title}>Customize your tags</Text>
</View>
@@ -75,7 +75,7 @@ export default class ModalTagSelector extends React.PureComponent {
<View style={modalTagSelectorStyle.buttons}>
<Button style={modalTagSelectorStyle.doneButton} text={'Done'} onPress={onDonePress} />
</View>
</TouchableOpacity>
</View>
</TouchableOpacity>
);
}
+22 -28
View File
@@ -44,39 +44,33 @@ class WelcomePage extends React.PureComponent {
}
startAuthenticating = () => {
const { authenticate } = this.props;
this.setState({ authenticationStarted: true, authenticationFailed: false });
NativeModules.VersionInfo.getAppVersion().then(appVersion => {
NativeModules.Firebase.getMessagingToken()
.then(firebaseToken => this.performAuthenticate(appVersion, firebaseToken))
.catch(() => {
this.performAuthenticate(appVersion); /* proceed without firebase */
});
NativeModules.Firebase.getMessagingToken().then(firebaseToken => {
Lbry.status()
.then(info => {
this.setState({ sdkStarted: true });
authenticate(appVersion, Platform.OS, firebaseToken);
})
.catch(error => {
if (this.state.statusTries >= WelcomePage.MAX_STATUS_TRIES) {
this.setState({ authenticationFailed: true });
// sdk_start_failed
NativeModules.Firebase.track('sdk_start_failed', null);
} else {
setTimeout(() => {
this.startAuthenticating();
this.setState({ statusTries: this.state.statusTries + 1 });
}, 1000); // Retry every second for a maximum of MAX_STATUS_TRIES tries (60 seconds)
}
});
});
});
};
performAuthenticate(appVersion, firebaseToken) {
const { authenticate } = this.props;
Lbry.status()
.then(info => {
this.setState({ sdkStarted: true });
authenticate(appVersion, Platform.OS, firebaseToken);
})
.catch(error => {
if (this.state.statusTries >= WelcomePage.MAX_STATUS_TRIES) {
this.setState({ authenticationFailed: true });
// sdk_start_failed
NativeModules.Firebase.track('sdk_start_failed', null);
} else {
setTimeout(() => {
this.startAuthenticating();
this.setState({ statusTries: this.state.statusTries + 1 });
}, 1000); // Retry every second for a maximum of MAX_STATUS_TRIES tries (60 seconds)
}
});
}
render() {
const { authenticating, authToken, onWelcomePageLayout } = this.props;
+3 -10
View File
@@ -300,19 +300,12 @@ class FirstRunScreen extends React.PureComponent {
if (NativeModules.UtilityModule) {
const newPassword = this.state.walletPassword ? this.state.walletPassword : '';
NativeModules.UtilityModule.setSecureValue(Constants.KEY_WALLET_PASSWORD, newPassword);
if (newPassword.trim().length === 0) {
// blank password. Do not encrypt
Lbry.wallet_encrypt({ new_password: newPassword }).then(() => {
// fresh account, new password set
getSync(newPassword);
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
this.closeFinalPage();
} else {
Lbry.wallet_encrypt({ new_password: newPassword }).then(() => {
// fresh account, new password set
getSync(newPassword);
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
this.closeFinalPage();
});
}
});
}
};
+1
View File
@@ -409,6 +409,7 @@ class PublishPage extends React.PureComponent {
};
handlePublishFailure = error => {
console.log(error);
const { notify } = this.props;
notify({ message: __('Your content could not be published at this time. Please try again.') });
this.setState({ publishStarted: false });
+12 -8
View File
@@ -91,8 +91,10 @@ class SplashScreen extends React.PureComponent {
// user is authenticated, navigate to the main view
if (user.has_verified_email) {
NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(walletPassword => {
getSync(walletPassword, () => this.getUserSettings());
this.navigateToMain();
getSync(walletPassword, () => {
this.getUserSettings();
this.navigateToMain();
});
});
return;
}
@@ -138,15 +140,17 @@ class SplashScreen extends React.PureComponent {
if (user && user.id && user.has_verified_email) {
// user already authenticated
NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(walletPassword => {
getSync(walletPassword, () => this.getUserSettings());
this.navigateToMain();
getSync(walletPassword, err => {
this.getUserSettings();
this.navigateToMain();
});
});
} else {
NativeModules.VersionInfo.getAppVersion().then(appVersion => {
this.setState({ shouldAuthenticate: true });
NativeModules.Firebase.getMessagingToken()
.then(firebaseToken => authenticate(appVersion, Platform.OS, firebaseToken))
.catch(() => authenticate(appVersion, Platform.OS));
NativeModules.Firebase.getMessagingToken().then(firebaseToken => {
this.setState({ shouldAuthenticate: true });
authenticate(appVersion, Platform.OS, firebaseToken);
});
});
}
});
@@ -37,17 +37,11 @@ class SyncVerifyPage extends React.PureComponent {
if (!hasSyncedWallet) {
// fresh account with no sync
const newPassword = this.state.password ? this.state.password : '';
if (newPassword.trim().length === 0) {
Lbry.wallet_encrypt({ new_password: newPassword }).then(() => {
getSync(newPassword);
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
navigation.goBack();
} else {
Lbry.wallet_encrypt({ new_password: newPassword }).then(() => {
getSync(newPassword);
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
navigation.goBack();
});
}
});
} else {
syncApply(syncHash, syncData, this.state.password ? this.state.password : '');
}