From dff89ea4e05f4620f6269c464ca28a1354f2f6ca Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Tue, 16 Nov 2021 13:40:16 +0100
Subject: [PATCH] Bugfix: when allowMultipleIdentities is false always return
 primaryIdentity

---
 .../v/0.0.0/app/libraries/RainLoop/Model/Identity.php       | 4 ++--
 .../v/0.0.0/app/libraries/RainLoop/Providers/Identities.php | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
index b8af51a5c..7901763e3 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
@@ -43,8 +43,8 @@ class Identity implements \JsonSerializable
 
 	function __construct(string $sId = '', string $sEmail = '')
 	{
-		$this->sId = empty($sId) ? '' : $sId;
-		$this->sEmail = empty($sEmail) ? '' : $sEmail;
+		$this->sId = $sId;
+		$this->sEmail = $sEmail;
 		$this->sName = '';
 		$this->sReplyTo = '';
 		$this->sBcc = '';
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
index 2a38c31a2..cf1331a6c 100755
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
@@ -43,8 +43,10 @@ class Identities extends AbstractProvider
 		}));
 
 		// If no primary identity is found, generate default one from account info
-		if ($primaryIdentity === null || $primaryIdentity === false)
-			$identities[] = $primaryIdentity = new Identity('', $account->Email());
+		if ($primaryIdentity === null || $primaryIdentity === false) {
+			$primaryIdentity = $primaryIdentity = new Identity('', $account->Email());
+			$identities[] = $primaryIdentity;
+		}
 
 		// Return only primary identity or all identities
 		return $allowMultipleIdentities ? $identities : [$primaryIdentity];