Compare commits

...

2 Commits

Author SHA1 Message Date
Harrison Healey
bd658e13a1 Bump app build number to 164 (#2469) 2018-12-19 11:14:24 -05:00
Harrison Healey
cf974d67ae MM-13020 Revert "MM-11477 Wrap objects thrown by Client4 in a proper error type (#2328)" (1.14) (#2342) 2018-11-19 14:29:08 -05:00
8 changed files with 17 additions and 18 deletions

View File

@@ -113,7 +113,7 @@ android {
applicationId "com.mattermost.rnbeta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 158
versionCode 164
versionName "1.14.0"
multiDexEnabled = true
ndk {

View File

@@ -6,7 +6,6 @@ import RNFetchBlob from 'rn-fetch-blob';
import urlParse from 'url-parse';
import {Client4} from 'mattermost-redux/client';
import {ClientError} from 'mattermost-redux/client/client4';
import mattermostBucket from 'app/mattermost_bucket';
import LocalConfig from 'assets/config';
@@ -29,10 +28,10 @@ const handleRedirectProtocol = (url, response) => {
Client4.doFetchWithResponse = async (url, options) => {
if (!Client4.online) {
throw new ClientError(Client4.getUrl(), {
throw {
message: 'no internet connection',
url,
});
};
}
let response;
@@ -49,21 +48,21 @@ Client4.doFetchWithResponse = async (url, options) => {
data = await response.json();
} catch (err) {
if (response && response.resp && response.resp.data && response.resp.data.includes('SSL certificate')) {
throw new ClientError(Client4.getUrl(), {
throw {
message: 'You need to use a valid client certificate in order to connect to this Mattermost server',
status_code: 401,
url,
});
};
}
throw new ClientError(Client4.getUrl(), {
throw {
message: 'Received invalid response from the server.',
intl: {
id: t('mobile.request.invalid_response'),
defaultMessage: 'Received invalid response from the server.',
},
url,
});
};
}
if (headers[HEADER_X_CLUSTER_ID] || headers[HEADER_X_CLUSTER_ID.toLowerCase()]) {
@@ -97,12 +96,12 @@ Client4.doFetchWithResponse = async (url, options) => {
console.error(msg); // eslint-disable-line no-console
}
throw new ClientError(Client4.getUrl(), {
throw {
message: msg,
server_error_id: data.id,
status_code: data.status_code,
url,
});
};
};
const initFetchConfig = async () => {

View File

@@ -2470,7 +2470,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 158;
CURRENT_PROJECT_VERSION = 164;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
@@ -2519,7 +2519,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 158;
CURRENT_PROJECT_VERSION = 164;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;

View File

@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>158</string>
<string>164</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

View File

@@ -23,7 +23,7 @@
<key>CFBundleShortVersionString</key>
<string>1.14.0</string>
<key>CFBundleVersion</key>
<string>158</string>
<string>164</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>

View File

@@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>158</string>
<string>164</string>
</dict>
</plist>

4
package-lock.json generated
View File

@@ -9797,8 +9797,8 @@
"integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w="
},
"mattermost-redux": {
"version": "github:mattermost/mattermost-redux#e467e16551cfc70be83c531f0836df894b2bf65a",
"from": "github:mattermost/mattermost-redux#e467e16551cfc70be83c531f0836df894b2bf65a",
"version": "github:mattermost/mattermost-redux#0edff8eef023b79ac14e7fff21c2fb9bcf879e4e",
"from": "github:mattermost/mattermost-redux#0edff8eef023b79ac14e7fff21c2fb9bcf879e4e",
"requires": {
"deep-equal": "1.0.1",
"eslint-plugin-header": "1.2.0",

View File

@@ -17,7 +17,7 @@
"intl": "1.2.5",
"jail-monkey": "1.0.0",
"jsc-android": "224109.1.0",
"mattermost-redux": "github:mattermost/mattermost-redux#e467e16551cfc70be83c531f0836df894b2bf65a",
"mattermost-redux": "github:mattermost/mattermost-redux#0edff8eef023b79ac14e7fff21c2fb9bcf879e4e",
"mime-db": "1.36.0",
"moment-timezone": "0.5.21",
"prop-types": "15.6.2",