From 1a563a79174ce95ad1be047d6ac6a6a322c542c4 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 8 Jan 2026 13:20:10 +0200
Subject: [PATCH] Fix android logout (#9398)

---
 app/managers/intune_manager/index.ts | 2 --
 app/managers/session_manager.ts      | 4 ++--
 package-lock.json                    | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/managers/intune_manager/index.ts b/app/managers/intune_manager/index.ts
index 744845294..e2261195c 100644
--- a/app/managers/intune_manager/index.ts
+++ b/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;
         }
 
diff --git a/app/managers/session_manager.ts b/app/managers/session_manager.ts
index 6a0106150..48d4eb34e 100644
--- a/app/managers/session_manager.ts
+++ b/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 = '';
diff --git a/package-lock.json b/package-lock.json
index 6c0df64c0..032d58235 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "mattermost-mobile",
-      "version": "2.35.0",
+      "version": "2.36.0",
       "hasInstallScript": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -24639,4 +24639,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}