self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Mobile: Fixes #299: App freezes when connecting to OneDrive login page while internet connection is down

Browse Source
This commit is contained in:
Laurent Cozic 2018-03-14 23:17:02 +00:00
parent 26331f61e1
commit 9e0bf1acb2
20 changed files with 5 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ReactNativeClient/lib/BaseModel.js
View File

@ -1,4 +1,3 @@
const { Log } = require('lib/log.js');
const { Database } = require('lib/database.js');
const { uuid } = require('lib/uuid.js');
const { time } = require('lib/time-utils.js');
@ -423,7 +422,7 @@ class BaseModel {
output = this.filter(o);
} catch (error) {
Log.error('Cannot save model', error);
this.logger().error('Cannot save model', error);
}
this.releaseSaveMutex(o, mutexRelease);

1
ReactNativeClient/lib/components/action-button.js
View File

@ -4,7 +4,6 @@ const Icon = require('react-native-vector-icons/Ionicons').default;
const ReactNativeActionButton = require('react-native-action-button').default;
const { connect } = require('react-redux');
const { globalStyle } = require('lib/components/global-style.js');
const { Log } = require('lib/log.js');
const { _ } = require('lib/locale.js');
const styles = StyleSheet.create({

2
ReactNativeClient/lib/components/note-body-viewer.js
View File

@ -104,7 +104,7 @@ class NoteBodyViewer extends Component {
style={webViewStyle}
source={source}
onLoadEnd={() => this.onLoadEnd()}
onError={(e) => reg.logger().error('WebView error', e) }
onError={() => reg.logger().error('WebView error') }
onMessage={(event) => {
let msg = event.nativeEvent.data;

1
ReactNativeClient/lib/components/note-item.js
View File

@ -1,7 +1,6 @@
const React = require('react'); const Component = React.Component;
const { connect } = require('react-redux');
const { ListView, Text, TouchableOpacity , View, StyleSheet } = require('react-native');
const { Log } = require('lib/log.js');
const { _ } = require('lib/locale.js');
const { Checkbox } = require('lib/components/checkbox.js');
const { reg } = require('lib/registry.js');

1
ReactNativeClient/lib/components/note-list.js
View File

@ -1,7 +1,6 @@
const React = require('react'); const Component = React.Component;
const { connect } = require('react-redux');
const { ListView, Text, TouchableHighlight, Switch, View, StyleSheet } = require('react-native');
const { Log } = require('lib/log.js');
const { _ } = require('lib/locale.js');
const { Checkbox } = require('lib/components/checkbox.js');
const { NoteItem } = require('lib/components/note-item.js');

1
ReactNativeClient/lib/components/screen-header.js
View File

@ -2,7 +2,6 @@ const React = require('react'); const Component = React.Component;
const { connect } = require('react-redux');
const { Platform, View, Text, Button, StyleSheet, TouchableOpacity, Image, ScrollView, Dimensions } = require('react-native');
const Icon = require('react-native-vector-icons/Ionicons').default;
const { Log } = require('lib/log.js');
const { BackButtonService } = require('lib/services/back-button.js');
const NavService = require('lib/services/NavService.js');
const { ReportService } = require('lib/services/report.js');

1
ReactNativeClient/lib/components/screens/folder.js
View File

@ -1,7 +1,6 @@
const React = require('react'); const Component = React.Component;
const { View, Button, TextInput, StyleSheet } = require('react-native');
const { connect } = require('react-redux');
const { Log } = require('lib/log.js');
const { ActionButton } = require('lib/components/action-button.js');
const Folder = require('lib/models/Folder.js');
const BaseModel = require('lib/BaseModel.js');

1
ReactNativeClient/lib/components/screens/log.js
View File

@ -1,7 +1,6 @@
const React = require('react'); const Component = React.Component;
const { ListView, View, Text, Button, StyleSheet, Platform } = require('react-native');
const { connect } = require('react-redux');
const { Log } = require('lib/log.js');
const { reg } = require('lib/registry.js');
const { ScreenHeader } = require('lib/components/screen-header.js');
const { time } = require('lib/time-utils');

1
ReactNativeClient/lib/components/screens/note.js
View File

@ -2,7 +2,6 @@ const React = require('react'); const Component = React.Component;
const { Platform, Keyboard, BackHandler, View, Button, TextInput, WebView, Text, StyleSheet, Linking, Image } = require('react-native');
const { connect } = require('react-redux');
const { uuid } = require('lib/uuid.js');
const { Log } = require('lib/log.js');
const RNFS = require('react-native-fs');
const Note = require('lib/models/Note.js');
const Setting = require('lib/models/Setting.js');

1
ReactNativeClient/lib/components/screens/notes.js
View File

@ -3,7 +3,6 @@ const { View, Button, Text } = require('react-native');
const { stateUtils } = require('lib/reducer.js');
const { connect } = require('react-redux');
const { reg } = require('lib/registry.js');
const { Log } = require('lib/log.js');
const { NoteList } = require('lib/components/note-list.js');
const Folder = require('lib/models/Folder.js');
const Tag = require('lib/models/Tag.js');

9
ReactNativeClient/lib/components/screens/onedrive-login.js
View File

@ -2,7 +2,6 @@ const React = require('react'); const Component = React.Component;
const { View } = require('react-native');
const { WebView, Button, Text } = require('react-native');
const { connect } = require('react-redux');
const { Log } = require('lib/log.js');
const Setting = require('lib/models/Setting.js');
const { ScreenHeader } = require('lib/components/screen-header.js');
const { reg } = require('lib/registry.js');
@ -44,8 +43,6 @@ class OneDriveLoginScreenComponent extends BaseScreenComponent {
const parsedUrl = parseUri(url);
if (!this.authCode_ && parsedUrl && parsedUrl.queryKey && parsedUrl.queryKey.code) {
Log.info('URL: ', url, parsedUrl.queryKey);
this.authCode_ = parsedUrl.queryKey.code
try {
@ -60,8 +57,8 @@ class OneDriveLoginScreenComponent extends BaseScreenComponent {
}
}
async webview_error(error) {
Log.error(error);
async webview_error() {
alert('Could not load page. Please check your connection and try again.');
}
retryButton_click() {
@ -93,7 +90,7 @@ class OneDriveLoginScreenComponent extends BaseScreenComponent {
<WebView
source={source}
onNavigationStateChange={(o) => { this.webview_load(o); }}
onError={(error) => { this.webview_error(error); }}
onError={() => { this.webview_error(); }}
/>
<Button title={_("Refresh")} onPress={() => { this.retryButton_click(); }}></Button>
</View>

1
ReactNativeClient/lib/components/screens/status.js
View File

@ -2,7 +2,6 @@ const React = require('react'); const Component = React.Component;
const { ListView, StyleSheet, View, Text, Button, FlatList } = require('react-native');
const Setting = require('lib/models/Setting.js');
const { connect } = require('react-redux');
const { Log } = require('lib/log.js');
const { reg } = require('lib/registry.js');
const { ScreenHeader } = require('lib/components/screen-header.js');
const { time } = require('lib/time-utils');

1
ReactNativeClient/lib/components/screens/welcome.js
View File

@ -1,7 +1,6 @@
const React = require('react'); const Component = React.Component;
const { View, Text, StyleSheet } = require('react-native');
const { connect } = require('react-redux');
const { Log } = require('lib/log.js');
const { ScreenHeader } = require('lib/components/screen-header.js');
const { ActionButton } = require('lib/components/action-button.js');
const { BaseScreenComponent } = require('lib/components/base-screen.js');

1
ReactNativeClient/lib/components/side-menu-content.js
View File

@ -2,7 +2,6 @@ const React = require('react'); const Component = React.Component;
const { TouchableOpacity , Button, Text, Image, StyleSheet, ScrollView, View } = require('react-native');
const { connect } = require('react-redux');
const Icon = require('react-native-vector-icons/Ionicons').default;
const { Log } = require('lib/log.js');
const Tag = require('lib/models/Tag.js');
const Note = require('lib/models/Note.js');
const Folder = require('lib/models/Folder.js');

1
ReactNativeClient/lib/components/side-menu.js
View File

@ -1,6 +1,5 @@
const React = require('react'); const Component = React.Component;
const { connect } = require('react-redux');
const { Log } = require('lib/log.js');
const SideMenu_ = require('react-native-side-menu').default;
class SideMenuComponent extends SideMenu_ {};

40
ReactNativeClient/lib/log.js
View File

@ -1,40 +0,0 @@
// Custom wrapper for `console` to allow for custom logging (to file, etc.) if needed.
class Log {
static setLevel(v) {
this.level_ = v;
}
static level() {
return this.level_ === undefined ? Log.LEVEL_DEBUG : this.level_;
}
static debug(...o) {
if (Log.level() > Log.LEVEL_DEBUG) return;
console.info(...o);
}
static info(...o) {
if (Log.level() > Log.LEVEL_INFO) return;
console.info(...o);
}
static warn(...o) {
if (Log.level() > Log.LEVEL_WARN) return;
console.info(...o);
}
static error(...o) {
if (Log.level() > Log.LEVEL_ERROR) return;
console.info(...o);
}
}
Log.LEVEL_DEBUG = 0;
Log.LEVEL_INFO = 10;
Log.LEVEL_WARN = 20;
Log.LEVEL_ERROR = 30;
module.exports = { Log };

1
ReactNativeClient/lib/models/Folder.js
View File

@ -1,5 +1,4 @@
const BaseModel = require('lib/BaseModel.js');
const { Log } = require('lib/log.js');
const { promiseChain } = require('lib/promise-utils.js');
const { time } = require('lib/time-utils.js');
const Note = require('lib/models/Note.js');

1
ReactNativeClient/lib/models/Note.js
View File

@ -1,5 +1,4 @@
const BaseModel = require('lib/BaseModel.js');
const { Log } = require('lib/log.js');
const { sprintf } = require('sprintf-js');
const BaseItem = require('lib/models/BaseItem.js');
const Setting = require('lib/models/Setting.js');

1
ReactNativeClient/main.js
View File

@ -7,7 +7,6 @@
// So there's basically still a one way flux: React => SQLite => Redux => React
const { AppRegistry } = require('react-native');
const { Log } = require('lib/log.js');
const { Root } = require('./root.js');
function main() {

1
ReactNativeClient/root.js
View File

@ -9,7 +9,6 @@ const AlarmServiceDriver = require('lib/services/AlarmServiceDriver');
const Alarm = require('lib/models/Alarm');
const { createStore, applyMiddleware } = require('redux');
const { shimInit } = require('lib/shim-init-react.js');
const { Log } = require('lib/log.js');
const { time } = require('lib/time-utils.js');
const { AppNav } = require('lib/components/app-nav.js');
const { Logger } = require('lib/logger.js');