Fix android logout (#9398) (#9403)

(cherry picked from commit 1a563a7)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>

Author: mattermost-build

app/managers/intune_manager/index.ts

@@ -92,7 +92,6 @@ export class IntuneManagerSingleton {
      */
     async enrollServer(serverUrl: string, identity: MSALIdentity): Promise<void> {
         if (!Intune) {
-            logWarning('IntuneManager: Cannot enroll in MAM - Intune library not available');
             return;
         }
 
@@ -112,7 +111,6 @@ export class IntuneManagerSingleton {
      */
     async unenrollServer(serverUrl: string, doWipe: boolean): Promise<void> {
         if (!Intune) {
-            logWarning('IntuneManager: Cannot unenroll - Intune library not available');
             return;
         }
 

app/managers/session_manager.ts

@@ -112,11 +112,11 @@ export class SessionManagerSingleton {
 
             const activeServerUrl = await DatabaseManager.getActiveServerUrl();
             const activeServerDisplayName = await DatabaseManager.getActiveServerDisplayName();
-            await terminateSession(serverUrl, removeServer);
-            SecurityManager.removeServer(serverUrl);
 
             // We do not unenroll with Wipe as we already removed all the data during terminateSession
             await IntuneManager.unenrollServer(serverUrl, false);
+            await terminateSession(serverUrl, removeServer);
+            SecurityManager.removeServer(serverUrl);
 
             if (activeServerUrl === serverUrl) {
                 let displayName = '';