Android: Fix when downloading many encrypted items

pull/272/head
Laurent Cozic 2018-03-05 18:21:42 +00:00
parent 7a985c2c8a
commit 122ab83a84
3 changed files with 5 additions and 51 deletions

View File

@ -1,51 +1,3 @@
const { main } = require('./main.js');
main();
// const React = require('react'); const Component = React.Component;
// import {
// AppRegistry,
// StyleSheet,
// Text,
// View
// } from 'react-native';
// module.exports = default class Joplin extends Component {;
// render() {
// return (
// <View style={styles.container}>
// <Text style={styles.welcome}>
// Welcome to React Native!
// </Text>
// <Text style={styles.instructions}>
// To get started, edit index.ios.js
// </Text>
// <Text style={styles.instructions}>
// Press Cmd+R to reload,{'\n'}
// Cmd+D or shake for dev menu
// </Text>
// </View>
// );
// }
// }
// const styles = StyleSheet.create({
// container: {
// flex: 1,
// justifyContent: 'center',
// alignItems: 'center',
// backgroundColor: '#F5FCFF',
// },
// welcome: {
// fontSize: 20,
// textAlign: 'center',
// margin: 10,
// },
// instructions: {
// textAlign: 'center',
// color: '#333333',
// marginBottom: 5,
// },
// });
// AppRegistry.registerComponent('Joplin', () => Joplin);
main();

View File

@ -80,7 +80,9 @@ class DecryptionWorker {
// }
const ItemClass = BaseItem.itemClass(item);
this.logger().info('DecryptionWorker: decrypting: ' + item.id + ' (' + ItemClass.tableName() + ')');
// Don't log in production as it results in many messages when importing many items
// this.logger().info('DecryptionWorker: decrypting: ' + item.id + ' (' + ItemClass.tableName() + ')');
try {
await ItemClass.decrypt(item);
} catch (error) {

View File

@ -18,7 +18,7 @@ async function main() {
console.info('URL = ' + url);
console.info('SHA256 = ' + sha256);
console.info('');
console.info('brew bump-formula-pr --strict joplin --url=' + url + ' --sha256=' + sha256);
console.info('brew update && brew bump-formula-pr --strict joplin --url=' + url + ' --sha256=' + sha256);
}
main().catch((error) => {