SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Verify push proxy on undefined and properly show error text (#6283)

Browse Source
This commit is contained in:
Daniel Espino García
2022-05-17 16:03:53 +02:00
committed by GitHub
parent 8c3b101d66
commit 1706b673ba
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/actions/remote/entry/app.ts
View File

@@ -114,7 +114,10 @@ export async function verifyPushProxy(serverUrl: string) {
const {database} = operator; const {database} = operator;
const ppVerification = await getPushVerificationStatus(database); const ppVerification = await getPushVerificationStatus(database);
if (ppVerification !== PUSH_PROXY_STATUS_UNKNOWN) { if (
ppVerification !== PUSH_PROXY_STATUS_UNKNOWN &&
ppVerification !== ''
) {
return; return;
} }

4
app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
View File

@@ -354,12 +354,12 @@ const ServerItem = ({
let pushAlertText; let pushAlertText;
if (server.lastActiveAt) { if (server.lastActiveAt) {
if (pushProxyStatus === PUSH_PROXY_STATUS_NOT_AVAILABLE) { if (pushProxyStatus === PUSH_PROXY_STATUS_NOT_AVAILABLE) {
intl.formatMessage({ pushAlertText = intl.formatMessage({
id: 'server_list.push_proxy_error', id: 'server_list.push_proxy_error',
defaultMessage: 'Notifications cannot be received from this server because of its configuration. Contact your system admin.', defaultMessage: 'Notifications cannot be received from this server because of its configuration. Contact your system admin.',
}); });
} else { } else {
intl.formatMessage({ pushAlertText = intl.formatMessage({
id: 'server_list.push_proxy_unknown', id: 'server_list.push_proxy_unknown',
defaultMessage: 'Notifications could not be received from this server because of its configuration. Log out and Log in again to retry.', defaultMessage: 'Notifications could not be received from this server because of its configuration. Log out and Log in again to retry.',
}); });