From e78833cbcbba54ffa92daf5bab0724104c4a71a9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 09:33:47 -0400
Subject: [PATCH 1/2] Bumped version to 2023.5.0 (#2553)

Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>
---
 src/Android/Properties/AndroidManifest.xml | 2 +-
 src/iOS.Autofill/Info.plist                | 2 +-
 src/iOS.Extension/Info.plist               | 2 +-
 src/iOS.ShareExtension/Info.plist          | 2 +-
 src/iOS/Info.plist                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml
index 5e0839872..67cfb1652 100644
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.4.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.5.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
diff --git a/src/iOS.Autofill/Info.plist b/src/iOS.Autofill/Info.plist
index c5466ecfb..2f9d98cbd 100644
--- a/src/iOS.Autofill/Info.plist
+++ b/src/iOS.Autofill/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.4.1</string>
+	<string>2023.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleLocalizations</key>
diff --git a/src/iOS.Extension/Info.plist b/src/iOS.Extension/Info.plist
index 0d913e4b2..5408b7a2d 100644
--- a/src/iOS.Extension/Info.plist
+++ b/src/iOS.Extension/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.find-login-action-extension</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.4.1</string>
+	<string>2023.5.0</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
diff --git a/src/iOS.ShareExtension/Info.plist b/src/iOS.ShareExtension/Info.plist
index d86024116..4ece99627 100644
--- a/src/iOS.ShareExtension/Info.plist
+++ b/src/iOS.ShareExtension/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.4.1</string>
+	<string>2023.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>MinimumOSVersion</key>
diff --git a/src/iOS/Info.plist b/src/iOS/Info.plist
index 256054ab5..b25a764ad 100644
--- a/src/iOS/Info.plist
+++ b/src/iOS/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.4.1</string>
+	<string>2023.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleIconName</key>

From bebf23785d2b4d8cab49eaf20fba0e2d91840561 Mon Sep 17 00:00:00 2001
From: Federico Maccaroni <fedemkr@gmail.com>
Date: Thu, 1 Jun 2023 10:35:35 +0300
Subject: [PATCH 2/2] PM-2232 Fix api response not being read as string because
 the content was not being considered json when it was indeed. Now Netacea
 messages are shown on the UI. (#2541)

---
 src/Core/Services/ApiService.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Core/Services/ApiService.cs b/src/Core/Services/ApiService.cs
index 436916aff..dde3b9505 100644
--- a/src/Core/Services/ApiService.cs
+++ b/src/Core/Services/ApiService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Text;
@@ -975,7 +976,19 @@ namespace Bit.Core.Services
 
         private bool IsJsonResponse(HttpResponseMessage response)
         {
-            return (response.Content?.Headers?.ContentType?.MediaType ?? string.Empty) == "application/json";
+            if (response.Content?.Headers is null)
+            {
+                return false;
+            }
+
+            if (response.Content.Headers.ContentType?.MediaType == "application/json")
+            {
+                return true;
+            }
+
+            return response.Content.Headers.TryGetValues("Content-Type", out var vals)
+                   &&
+                   vals?.Any(v => v.Contains("application/json")) is true;
         }
 
         #endregion