From 8a95000bd052570591c791df8dc98ebdb32abbc2 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Mon, 8 Jun 2020 19:24:16 +0200
Subject: [PATCH] MM-25831 Fix timing issue with cancelPing (#4394)

With `getUrl` recently [becoming async](https://github.com/mattermost/mattermost-mobile/commit/293470ff#diff-60b06b1c4aab028b96d9b207e84000c6R316), the global definition of the cancelPing function wasn't being made available in time for use by other functions (e.g. `handleSslProblem` and `handleConnect`)
---
 app/screens/select_server/select_server.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/screens/select_server/select_server.js b/app/screens/select_server/select_server.js
index 230d8bf29..bb9b7a3f6 100644
--- a/app/screens/select_server/select_server.js
+++ b/app/screens/select_server/select_server.js
@@ -313,10 +313,6 @@ export default class SelectServer extends PureComponent {
             error: null,
         });
 
-        const serverUrl = await this.getUrl(url, !retryWithHttp);
-        Client4.setUrl(serverUrl);
-        handleServerUrlChanged(serverUrl);
-
         let cancel = false;
         this.cancelPing = () => {
             cancel = true;
@@ -329,6 +325,10 @@ export default class SelectServer extends PureComponent {
             this.cancelPing = null;
         };
 
+        const serverUrl = await this.getUrl(url, !retryWithHttp);
+        Client4.setUrl(serverUrl);
+        handleServerUrlChanged(serverUrl);
+
         try {
             const result = await getPing();