From 0cbc26105134fe05573fc62825d09244d60c5d14 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sun, 19 Sep 2021 19:15:10 +0100 Subject: [PATCH] Chore: Remove last remnants of discontinued Nextcloud App --- .../gui/ConfigScreen/ConfigScreen.tsx | 16 ------- .../lib/components/shared/config-shared.js | 3 -- readme/nextcloud_app.md | 48 ------------------- 3 files changed, 67 deletions(-) delete mode 100644 readme/nextcloud_app.md diff --git a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx index d4e4da8d5..d27ab8d56 100644 --- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx +++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx @@ -42,9 +42,6 @@ class ConfigScreenComponent extends React.Component { this.sidebar_selectionChange = this.sidebar_selectionChange.bind(this); this.checkSyncConfig_ = this.checkSyncConfig_.bind(this); - // this.checkNextcloudAppButton_click = this.checkNextcloudAppButton_click.bind(this); - this.showLogButton_click = this.showLogButton_click.bind(this); - this.nextcloudAppHelpLink_click = this.nextcloudAppHelpLink_click.bind(this); this.onCancelClick = this.onCancelClick.bind(this); this.onSaveClick = this.onSaveClick.bind(this); this.onApplyClick = this.onApplyClick.bind(this); @@ -58,19 +55,6 @@ class ConfigScreenComponent extends React.Component { await shared.checkSyncConfig(this, this.state.settings); } - // async checkNextcloudAppButton_click() { - // this.setState({ showNextcloudAppLog: true }); - // await shared.checkNextcloudApp(this, this.state.settings); - // } - - showLogButton_click() { - this.setState({ showNextcloudAppLog: true }); - } - - nextcloudAppHelpLink_click() { - bridge().openExternal('https://joplinapp.org/nextcloud_app'); - } - UNSAFE_componentWillMount() { this.setState({ settings: this.props.settings }); } diff --git a/packages/lib/components/shared/config-shared.js b/packages/lib/components/shared/config-shared.js index 002226afe..ab7b3ea94 100644 --- a/packages/lib/components/shared/config-shared.js +++ b/packages/lib/components/shared/config-shared.js @@ -9,10 +9,8 @@ const shared = {}; shared.init = function(comp) { if (!comp.state) comp.state = {}; comp.state.checkSyncConfigResult = null; - comp.state.checkNextcloudAppResult = null; comp.state.settings = {}; comp.state.changedSettingKeys = []; - comp.state.showNextcloudAppLog = false; comp.state.showAdvancedSettings = false; }; @@ -35,7 +33,6 @@ shared.checkSyncConfig = async function(comp, settings) { comp.setState({ checkSyncConfigResult: result }); if (result.ok) { - // await shared.checkNextcloudApp(comp, settings); // Users often expect config to be auto-saved at this point, if the config check was successful shared.saveSettings(comp); } diff --git a/readme/nextcloud_app.md b/readme/nextcloud_app.md deleted file mode 100644 index 6fbaaab7c..000000000 --- a/readme/nextcloud_app.md +++ /dev/null @@ -1,48 +0,0 @@ -# Joplin Web API for Nextcloud - -* * * - -**IMPORTANT: THIS APPLICATION IS DEPRECATED AND WILL NO LONGER BE SUPPORTED FROM JOPLIN 1.6.x** - -It is [deprecated](https://discourse.joplinapp.org/t/joplin-web-api-for-nextcloud/4491/72?u=laurent) in favour of [Joplin Server](https://discourse.joplinapp.org/t/joplin-server-pre-release-is-now-available/13605), so if you are relying on it please do not upgrade to Joplin 1.6.x till you are ready to migrate to Joplin Server or some other alternative. - -* * * - -**This is a beta feature, not yet completed. More info coming soon!** - -The app can be downloaded from there: https://apps.nextcloud.com/apps/joplin - -The Joplin Web API for Nextcloud is a helper application that enables certain features that are not possible otherwise. In particular: - -- Sharing a note publicly -- Sharing a note with another Joplin user (who uses the same Nextcloud instance) -- Collaborating on a note -- Sharing a notebook - -## FAQ - -> Does it work with encrypted notes? - -No - -> Does it render images and other attachments? - -No - -> How about math formulas? - -No - -> Can I share a notebook? - -No - -> Can I edit a shared note directly on the browser? - -No - -## TODO - -- [ ] Handle encrypted notes (shared notes will be unencrypted on server) -- [ ] Move Joplin note renderer to separate package and re-use it to render notes in the Nextcloud app -- [ ] Allow editing note in browser