Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6116bd3809 | ||
|
|
40e2080c52 | ||
|
|
7294848802 | ||
|
|
0042b4ce43 | ||
|
|
8e99074ba4 | ||
|
|
6f891c8b27 | ||
|
|
0202054edb | ||
|
|
e541dcc381 | ||
|
|
156c3e1a72 | ||
|
|
b0c5b6f062 | ||
|
|
381e780d8d |
No files matched your search
+1
-1
Submodule android updated: ea8ac783a8...b7b6c05bd3.
@@ -312,6 +312,8 @@ class AppWithNavigationState extends React.Component {
|
||||
'hardwareBackPress',
|
||||
function() {
|
||||
const { dispatch, nav, drawerStack } = this.props;
|
||||
console.log(nav);
|
||||
|
||||
if (drawerStack.length > 1) {
|
||||
dispatchNavigateBack(dispatch, nav, drawerStack);
|
||||
return true;
|
||||
|
||||
@@ -44,7 +44,6 @@ const Constants = {
|
||||
SETTING_BACKUP_DISMISSED: 'backupDismissed',
|
||||
SETTING_REWARDS_NOT_INTERESTED: 'rewardsNotInterested',
|
||||
SETTING_DEVICE_WALLET_SYNCED: 'deviceWalletSynced',
|
||||
SETTING_DHT_ENABLED: 'dhtEnabled',
|
||||
|
||||
ACTION_DELETE_COMPLETED_BLOBS: 'DELETE_COMPLETED_BLOBS',
|
||||
ACTION_FIRST_RUN_PAGE_CHANGED: 'FIRST_RUN_PAGE_CHANGED',
|
||||
|
||||
@@ -58,6 +58,7 @@ window.__ = __;
|
||||
|
||||
const globalExceptionHandler = (error, isFatal) => {
|
||||
if (error && NativeModules.Firebase) {
|
||||
console.log(error);
|
||||
NativeModules.Firebase.logException(!!isFatal, error.message ? error.message : 'No message', JSON.stringify(error));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -25,4 +25,7 @@ const perform = dispatch => ({
|
||||
toggleFullscreenMode: mode => dispatch(doToggleFullscreenMode(mode)),
|
||||
});
|
||||
|
||||
export default connect(select, perform)(LiteFilePage);
|
||||
export default connect(
|
||||
select,
|
||||
perform,
|
||||
)(LiteFilePage);
|
||||
@@ -11,7 +11,6 @@ const select = state => ({
|
||||
backgroundPlayEnabled: makeSelectClientSetting(SETTINGS.BACKGROUND_PLAY_ENABLED)(state),
|
||||
currentRoute: selectCurrentRoute(state),
|
||||
drawerStack: selectDrawerStack(state),
|
||||
enableDht: makeSelectClientSetting(Constants.SETTING_DHT_ENABLED)(state),
|
||||
keepDaemonRunning: makeSelectClientSetting(SETTINGS.KEEP_DAEMON_RUNNING)(state),
|
||||
language: makeSelectClientSetting(SETTINGS.LANGUAGE)(state),
|
||||
showNsfw: makeSelectClientSetting(SETTINGS.SHOW_NSFW)(state),
|
||||
@@ -30,4 +29,7 @@ const perform = dispatch => ({
|
||||
setPlayerVisible: () => dispatch(doSetPlayerVisible(false)),
|
||||
});
|
||||
|
||||
export default connect(select, perform)(SettingsPage);
|
||||
export default connect(
|
||||
select,
|
||||
perform
|
||||
)(SettingsPage);
|
||||
@@ -11,27 +11,16 @@ import settingsStyle from 'styles/settings';
|
||||
|
||||
const languageOptions = [
|
||||
{ code: 'default', name: 'Use device language' },
|
||||
{ code: 'jv', name: 'Basa Jawa' },
|
||||
{ code: 'da', name: 'Danish' },
|
||||
{ code: 'nl', name: 'Dutch' },
|
||||
{ code: 'en', name: 'English' },
|
||||
{ code: 'et', name: 'Estonian' },
|
||||
{ code: 'fr', name: 'French' },
|
||||
{ code: 'gu', name: 'Gujarati' },
|
||||
{ code: 'hi', name: 'Hindi' },
|
||||
{ code: 'id', name: 'Indonesian' },
|
||||
{ code: 'it', name: 'Italian' },
|
||||
{ code: 'kn', name: 'Kannada' },
|
||||
{ code: 'ms', name: 'Malay' },
|
||||
{ code: 'mr', name: 'Marathi' },
|
||||
{ code: 'tr', name: 'Turkish' },
|
||||
{ code: 'pl', name: 'Polish' },
|
||||
{ code: 'pt', name: 'Portuguese' },
|
||||
{ code: 'ro', name: 'Romanian' },
|
||||
{ code: 'ru', name: 'Russian' },
|
||||
{ code: 'sk', name: 'Slovak' },
|
||||
{ code: 'es', name: 'Spanish' },
|
||||
{ code: 'tr', name: 'Turkish' },
|
||||
{ code: 'uk', name: 'Ukrainian' },
|
||||
];
|
||||
|
||||
class SettingsPage extends React.PureComponent {
|
||||
@@ -151,7 +140,6 @@ class SettingsPage extends React.PureComponent {
|
||||
render() {
|
||||
const {
|
||||
backgroundPlayEnabled,
|
||||
enableDht,
|
||||
keepDaemonRunning,
|
||||
receiveSubscriptionNotifications,
|
||||
receiveRewardNotifications,
|
||||
@@ -169,7 +157,6 @@ class SettingsPage extends React.PureComponent {
|
||||
const actualReceiveRewardNotifications = this.getBooleanSetting(receiveRewardNotifications, true);
|
||||
const actualReceiveInterestsNotifications = this.getBooleanSetting(receiveInterestsNotifications, true);
|
||||
const actualReceiveCreatorNotifications = this.getBooleanSetting(receiveCreatorNotifications, true);
|
||||
const actualEnableDht = this.getBooleanSetting(enableDht, false);
|
||||
|
||||
return (
|
||||
<View style={settingsStyle.container}>
|
||||
@@ -307,7 +294,7 @@ class SettingsPage extends React.PureComponent {
|
||||
</Text>
|
||||
<Text style={settingsStyle.description}>
|
||||
{__(
|
||||
'Enable this option for quicker app launch and to keep the synchronisation with the blockchain up to date.',
|
||||
'Enable this option for quicker app launch and to keep the synchronisation with the blockchain up to date.'
|
||||
)}
|
||||
</Text>
|
||||
</View>
|
||||
@@ -323,23 +310,6 @@ class SettingsPage extends React.PureComponent {
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
<View style={settingsStyle.row}>
|
||||
<View style={settingsStyle.switchText}>
|
||||
<Text style={settingsStyle.label}>{__('Participate in the data network')}</Text>
|
||||
<Text style={settingsStyle.description}>
|
||||
{__('Enable DHT (this will take effect upon app and background service restart)')}
|
||||
</Text>
|
||||
</View>
|
||||
<View style={settingsStyle.switchContainer}>
|
||||
<Switch
|
||||
value={actualEnableDht}
|
||||
onValueChange={value => {
|
||||
this.setNativeBooleanSetting(Constants.SETTING_DHT_ENABLED, value);
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
</ScrollView>
|
||||
</View>
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user