Fix android logout (#9398) (#9403)

(cherry picked from commit 1a563a7917)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Mattermost Build 2026-01-08 13:31:26 +02:00 committed by GitHub
parent 87b6c31689
commit 105b5e0568
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 5 deletions

View file

@ -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;
}

View file

@ -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 = '';

2
package-lock.json generated
View file

@ -6,7 +6,7 @@
"packages": {
"": {
"name": "mattermost-mobile",
"version": "2.35.0",
"version": "2.36.0",
"hasInstallScript": true,
"license": "Apache 2.0",
"dependencies": {