From 75c923f00fcb3070a5c2f3f862186ab7c7897f27 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 5 Dec 2022 11:48:46 +0100
Subject: [PATCH] Prepare new Impersonate feature
 https://github.com/nextcloud/impersonate/pull/180

---
 .../snappymail/lib/AppInfo/Application.php      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
index 55b92449a..2d7c08af2 100644
--- a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
+++ b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
@@ -87,22 +87,21 @@ class Application extends App implements IBootstrap
 			SnappyMailHelper::loadApp();
 			\RainLoop\Api::Actions()->Logout(true);
 		});
-/*
+
 		// https://github.com/nextcloud/impersonate/issues/179
 		// https://github.com/nextcloud/impersonate/pull/180
-		$class = 'OCA\Impersonate\Events\ImpersonateEvent';
+		$class = 'OCA\Impersonate\Events\BeginImpersonateEvent';
 		if (\class_exists($class)) {
-			$this->dispatcher->addListener($class, function ($Event) {
+			$dispatcher->addListener($class, function ($Event) {
+				\OC::$server->getSession()['snappymail-password'] = '';
+				SnappyMailHelper::loadApp();
+				\RainLoop\Api::Actions()->Logout(true);
+			});
+			$dispatcher->addListener('OCA\Impersonate\Events\EndImpersonateEvent', function ($Event) {
 				\OC::$server->getSession()['snappymail-password'] = '';
 				SnappyMailHelper::loadApp();
 				\RainLoop\Api::Actions()->Logout(true);
 			});
 		}
-		\OC::$server->getUserSession()->listen('\OC\User', 'impersonate', function($user, $newUser) {
-			\OC::$server->getSession()['snappymail-password'] = '';
-			SnappyMailHelper::loadApp();
-			\RainLoop\Api::Actions()->Logout(true);
-		});
-*/
 	}
 }