diff --git a/app/actions/device/index.js b/app/actions/device/index.js index 9b3d1bbe3..fe4db6433 100644 --- a/app/actions/device/index.js +++ b/app/actions/device/index.js @@ -2,13 +2,11 @@ // See LICENSE.txt for license information. import {networkStatusChangedAction} from 'redux-offline'; -import {Client4} from 'mattermost-redux/client'; import {DeviceTypes} from 'app/constants'; export function connection(isOnline) { return async (dispatch) => { - Client4.setOnline(isOnline); dispatch(networkStatusChangedAction(isOnline)); dispatch({ type: DeviceTypes.CONNECTION_CHANGED, diff --git a/app/fetch_preconfig.js b/app/fetch_preconfig.js index 7f88d725a..33f78d877 100644 --- a/app/fetch_preconfig.js +++ b/app/fetch_preconfig.js @@ -37,15 +37,6 @@ const handleRedirectProtocol = (url, response) => { }; Client4.doFetchWithResponse = async (url, options) => { - // Removing the check of this flag to be handled natively. - // In case Android presents the out of memory issue, consider uncommenting line 42-47. - // if (!Client4.online) { - // throw new ClientError(Client4.getUrl(), { - // message: 'no internet connection', - // url, - // }); - // } - const customHeaders = LocalConfig.CustomRequestHeaders; let waitsForConnectivity = false; let timeoutIntervalForResource = 30; diff --git a/app/mattermost.js b/app/mattermost.js index bb8aaf3ac..6d2ec37b8 100644 --- a/app/mattermost.js +++ b/app/mattermost.js @@ -134,10 +134,6 @@ const resetBadgeAndVersion = () => { }; const handleLogout = () => { - // Because we can logout while being offline we reset - // the Client online flag to true cause the network handler - // is not available at this point - Client4.setOnline(true); Client4.setCSRF(null); store.dispatch(closeWebSocket(false)); diff --git a/app/screens/select_server/select_server.js b/app/screens/select_server/select_server.js index d11927d0d..ba70c7154 100644 --- a/app/screens/select_server/select_server.js +++ b/app/screens/select_server/select_server.js @@ -321,7 +321,6 @@ export default class SelectServer extends PureComponent { }); Client4.setUrl(url); - Client4.online = true; handleServerUrlChanged(url); let cancel = false; diff --git a/package-lock.json b/package-lock.json index b72798732..bc8f5a098 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2700,6 +2700,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -2744,7 +2745,8 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true + "dev": true, + "optional": true }, "is-glob": { "version": "4.0.0", @@ -4784,7 +4786,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4802,11 +4805,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4819,15 +4824,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4930,7 +4938,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4940,6 +4949,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4952,17 +4962,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4979,6 +4992,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5051,7 +5065,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5061,6 +5076,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5136,7 +5152,8 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5166,6 +5183,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5183,6 +5201,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5221,11 +5240,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true + "bundled": true, + "optional": true } } }, @@ -9730,8 +9751,8 @@ "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==" }, "mattermost-redux": { - "version": "github:mattermost/mattermost-redux#477150436ac1871d0d63954c4f4f4d16ff692483", - "from": "github:mattermost/mattermost-redux#477150436ac1871d0d63954c4f4f4d16ff692483", + "version": "github:mattermost/mattermost-redux#16a39c671193db23006d848c7866adbb5cae6901", + "from": "github:mattermost/mattermost-redux#16a39c671193db23006d848c7866adbb5cae6901", "requires": { "deep-equal": "1.0.1", "eslint-plugin-header": "3.0.0", @@ -10360,21 +10381,6 @@ } } }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - } - } - }, "moment": { "version": "2.22.2", "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", @@ -13040,7 +13046,8 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true + "dev": true, + "optional": true }, "braces": { "version": "2.3.2", @@ -13326,7 +13333,8 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true + "dev": true, + "optional": true }, "micromatch": { "version": "3.1.10", diff --git a/package.json b/package.json index 97395728a..8a80ad455 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "intl": "1.2.5", "jail-monkey": "2.0.0", "jsc-android": "236355.1.1", - "mattermost-redux": "github:mattermost/mattermost-redux#477150436ac1871d0d63954c4f4f4d16ff692483", + "mattermost-redux": "github:mattermost/mattermost-redux#16a39c671193db23006d848c7866adbb5cae6901", "mime-db": "1.38.0", "moment-timezone": "0.5.23", "prop-types": "15.7.2",