From ab2f646496a2b0941faf72fa6acfb8628912e104 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 27 May 2024 10:13:20 +0200
Subject: [PATCH] Bugfix: Nextcloud getPrimaryEMailAddress() on null

---
 plugins/nextcloud/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
index 4313043b2..83fdcbdc5 100644
--- a/plugins/nextcloud/index.php
+++ b/plugins/nextcloud/index.php
@@ -74,14 +74,14 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 	public function loginCredentials(string &$sEmail, string &$sLogin, ?string &$sPassword = null) : void
 	{
 		$ocUser = \OC::$server->getUserSession()->getUser();
-		$sEmail = $ocUser->getEMailAddress() ?: $oc->user->getPrimaryEMailAddress();
+		$sEmail = $ocUser->getEMailAddress() ?: $ocUser->getPrimaryEMailAddress();
 		$sLogin = $ocUser->getUID();
 	}
 
 	public function loginCredentials2(string &$sEmail, ?string &$sPassword = null) : void
 	{
 		$ocUser = \OC::$server->getUserSession()->getUser();
-		$sEmail = $ocUser->getEMailAddress() ?: $oc->user->getPrimaryEMailAddress();
+		$sEmail = $ocUser->getEMailAddress() ?: $ocUser->getPrimaryEMailAddress();
 	}
 
 	public function beforeLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
@@ -243,7 +243,7 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 				}
 				if (!$sEmail) {
 					$sEmail = $ocUser->getEMailAddress();
-//						?: $oc->user->getPrimaryEMailAddress();
+//						?: $ocUser->getPrimaryEMailAddress();
 				}
 /*
 				if ($config->getAppValue('snappymail', 'snappymail-autologin-oidc', false)) {