From 5a7028bd115c590919eb3055e9b9709ce15f8fde Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 30 Oct 2017 00:29:10 +0000 Subject: [PATCH] Got Android version working again --- CliClient/locales/en_GB.po | 14 +++++++++++--- CliClient/locales/fr_FR.po | 14 +++++++++++--- CliClient/locales/joplin.pot | 14 +++++++++++--- CliClient/package-lock.json | 2 +- CliClient/package.json | 2 +- ReactNativeClient/android/app/build.gradle | 4 ++-- .../lib/components/note-body-viewer.js | 4 ++++ ReactNativeClient/lib/components/note-list.js | 2 +- ReactNativeClient/lib/models/setting.js | 10 ++++++++-- ReactNativeClient/lib/reducer.js | 2 +- 10 files changed, 51 insertions(+), 17 deletions(-) diff --git a/CliClient/locales/en_GB.po b/CliClient/locales/en_GB.po index eef95cf0a..4b8c6220f 100644 --- a/CliClient/locales/en_GB.po +++ b/CliClient/locales/en_GB.po @@ -15,10 +15,10 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -msgid "Give focus to next widget" +msgid "Give focus to next pane" msgstr "" -msgid "Give focus to previous widget" +msgid "Give focus to previous pane" msgstr "" msgid "Enter command line mode" @@ -236,7 +236,9 @@ msgstr "" msgid "Note has been saved." msgstr "" -msgid "Exports Joplin data to the given target." +msgid "" +"Exports Joplin data to the given directory. By default, it will export the " +"complete database including notebooks, notes, tags and resources." msgstr "" msgid "Exports only the given note." @@ -260,6 +262,12 @@ msgstr "" msgid "The possible commands are:" msgstr "" +msgid "" +"In any command, a note or notebook can be refered to by title or ID, or " +"using the shortcuts `$n` or `$b` for, respectively, the currently selected " +"note or notebook. `$c` can be used to refer to the currently selected item." +msgstr "" + msgid "To move from one widget to another, press Tab or Shift+Tab." msgstr "" diff --git a/CliClient/locales/fr_FR.po b/CliClient/locales/fr_FR.po index 6ece3b5e9..d7b79709e 100644 --- a/CliClient/locales/fr_FR.po +++ b/CliClient/locales/fr_FR.po @@ -15,10 +15,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.0.3\n" -msgid "Give focus to next widget" +msgid "Give focus to next pane" msgstr "" -msgid "Give focus to previous widget" +msgid "Give focus to previous pane" msgstr "" msgid "Enter command line mode" @@ -261,7 +261,9 @@ msgstr "" msgid "Note has been saved." msgstr "Aucun carnet n'est spécifié." -msgid "Exports Joplin data to the given target." +msgid "" +"Exports Joplin data to the given directory. By default, it will export the " +"complete database including notebooks, notes, tags and resources." msgstr "" #, fuzzy @@ -288,6 +290,12 @@ msgstr "" msgid "The possible commands are:" msgstr "" +msgid "" +"In any command, a note or notebook can be refered to by title or ID, or " +"using the shortcuts `$n` or `$b` for, respectively, the currently selected " +"note or notebook. `$c` can be used to refer to the currently selected item." +msgstr "" + msgid "To move from one widget to another, press Tab or Shift+Tab." msgstr "" diff --git a/CliClient/locales/joplin.pot b/CliClient/locales/joplin.pot index eef95cf0a..4b8c6220f 100644 --- a/CliClient/locales/joplin.pot +++ b/CliClient/locales/joplin.pot @@ -15,10 +15,10 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -msgid "Give focus to next widget" +msgid "Give focus to next pane" msgstr "" -msgid "Give focus to previous widget" +msgid "Give focus to previous pane" msgstr "" msgid "Enter command line mode" @@ -236,7 +236,9 @@ msgstr "" msgid "Note has been saved." msgstr "" -msgid "Exports Joplin data to the given target." +msgid "" +"Exports Joplin data to the given directory. By default, it will export the " +"complete database including notebooks, notes, tags and resources." msgstr "" msgid "Exports only the given note." @@ -260,6 +262,12 @@ msgstr "" msgid "The possible commands are:" msgstr "" +msgid "" +"In any command, a note or notebook can be refered to by title or ID, or " +"using the shortcuts `$n` or `$b` for, respectively, the currently selected " +"note or notebook. `$c` can be used to refer to the currently selected item." +msgstr "" + msgid "To move from one widget to another, press Tab or Shift+Tab." msgstr "" diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json index 344a0acf5..0425d2a50 100644 --- a/CliClient/package-lock.json +++ b/CliClient/package-lock.json @@ -1,6 +1,6 @@ { "name": "joplin", - "version": "0.10.60", + "version": "0.10.61", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/CliClient/package.json b/CliClient/package.json index 84793e189..2b1c24afc 100644 --- a/CliClient/package.json +++ b/CliClient/package.json @@ -18,7 +18,7 @@ ], "owner": "Laurent Cozic" }, - "version": "0.10.60", + "version": "0.10.61", "bin": { "joplin": "./main.js" }, diff --git a/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle index b1f9effee..9850efb04 100644 --- a/ReactNativeClient/android/app/build.gradle +++ b/ReactNativeClient/android/app/build.gradle @@ -90,8 +90,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion 16 targetSdkVersion 22 - versionCode 49 - versionName "0.9.36" + versionCode 50 + versionName "0.9.37" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/ReactNativeClient/lib/components/note-body-viewer.js b/ReactNativeClient/lib/components/note-body-viewer.js index 9e160a05b..f00178bb9 100644 --- a/ReactNativeClient/lib/components/note-body-viewer.js +++ b/ReactNativeClient/lib/components/note-body-viewer.js @@ -130,6 +130,10 @@ class NoteBodyViewer extends Component { } renderer.image = (href, title, text) => { + if (!Resource.isResourceUrl(href)) { + return '' + href + ''; + } + const resourceId = Resource.urlToId(href); if (!this.state.resources[resourceId]) { this.loadResource(resourceId); diff --git a/ReactNativeClient/lib/components/note-list.js b/ReactNativeClient/lib/components/note-list.js index 5f34256b7..eeb17f5c0 100644 --- a/ReactNativeClient/lib/components/note-list.js +++ b/ReactNativeClient/lib/components/note-list.js @@ -50,7 +50,7 @@ class NoteListComponent extends Component { } filterNotes(notes) { - const todoFilter = Setting.value('todoFilter'); + const todoFilter = 'all'; //Setting.value('todoFilter'); if (todoFilter == 'all') return notes; const now = time.unixMs(); diff --git a/ReactNativeClient/lib/models/setting.js b/ReactNativeClient/lib/models/setting.js index b98013f89..a1de6315e 100644 --- a/ReactNativeClient/lib/models/setting.js +++ b/ReactNativeClient/lib/models/setting.js @@ -21,6 +21,10 @@ class Setting extends BaseModel { return output; } + static keyExists(key) { + return key in this.metadata_; + } + static keys(publicOnly = false, appType = null) { if (!this.keys_) { this.keys_ = []; @@ -56,12 +60,14 @@ class Setting extends BaseModel { this.cache_ = []; // Old keys - can be removed later - const ignore = ['clientId', 'sync.onedrive.auth', 'syncInterval', 'todoOnTop', 'todosOnTop']; + //const ignore = ['clientId', 'sync.onedrive.auth', 'syncInterval', 'todoOnTop', 'todosOnTop', 'todoFilter']; for (let i = 0; i < rows.length; i++) { let c = rows[i]; - if (ignore.indexOf(c.key) >= 0) continue; + if (!this.keyExists(c.key)) continue; + + //if (ignore.indexOf(c.key) >= 0) continue; // console.info(c.key + ' = ' + c.value); diff --git a/ReactNativeClient/lib/reducer.js b/ReactNativeClient/lib/reducer.js index 02593ab57..6e1446b66 100644 --- a/ReactNativeClient/lib/reducer.js +++ b/ReactNativeClient/lib/reducer.js @@ -166,7 +166,7 @@ const reducer = (state = defaultState, action) => { if (action.routeName == 'Welcome') navHistory = []; - reg.logger().info('Route: ' + currentRouteName + ' => ' + action.routeName); + //reg.logger().info('Route: ' + currentRouteName + ' => ' + action.routeName); newState = Object.assign({}, state);