Bumped version to 2022.6.2 (#1981)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 7802da2b9c)

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="2022.6.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="2022.6.2" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 

src/iOS.Autofill/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.6.1</string>
+	<string>2022.6.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleLocalizations</key>

src/iOS.Core/Utilities/AccountSwitchingOverlayHelper.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Bit.App.Controls;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
@@ -10,6 +11,8 @@ namespace Bit.iOS.Core.Utilities
 {
     public class AccountSwitchingOverlayHelper
     {
+        const string DEFAULT_SYSTEM_AVATAR_IMAGE = "person.2";
+
         IStateService _stateService;
         IMessagingService _messagingService;
         ILogger _logger;
@@ -23,9 +26,22 @@ namespace Bit.iOS.Core.Utilities
 
         public async Task<UIImage> CreateAvatarImageAsync()
         {
-            var avatarImageSource = new AvatarImageSource(await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
-            var avatarUIImage = await avatarImageSource.GetNativeImageAsync();
-            return avatarUIImage.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+            try
+            {
+                if (_stateService is null)
+                {
+                    throw new NullReferenceException(nameof(_stateService));
+                }
+
+                var avatarImageSource = new AvatarImageSource(await _stateService.GetNameAsync(), await _stateService.GetEmailAsync());
+                var avatarUIImage = await avatarImageSource.GetNativeImageAsync();
+                return avatarUIImage?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal) ?? UIImage.GetSystemImage(DEFAULT_SYSTEM_AVATAR_IMAGE);
+            }
+            catch (Exception ex)
+            {
+                _logger.Exception(ex);
+                return UIImage.GetSystemImage(DEFAULT_SYSTEM_AVATAR_IMAGE);
+            }
         }
 
         public AccountSwitchingOverlayView CreateAccountSwitchingOverlayView(UIView containerView)

src/iOS.Core/Utilities/ImageSourceExtensions.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Bit.Core.Services;
 using UIKit;
 using Xamarin.Forms;
-using Xamarin.Forms.Internals;
 using Xamarin.Forms.Platform.iOS;
 
 namespace Bit.iOS.Core.Utilities
@@ -17,25 +17,29 @@ namespace Bit.iOS.Core.Utilities
         public static async Task<UIImage> GetNativeImageAsync(this ImageSource source, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (source == null || source.IsEmpty)
+            {
                 return null;
+            }
 
             var handler = Xamarin.Forms.Internals.Registrar.Registered.GetHandlerForObject<IImageSourceHandler>(source);
             if (handler == null)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(new InvalidOperationException("GetNativeImageAsync failed cause IImageSourceHandler couldn't be found"));
                 return null;
+            }
 
             try
             {
                 float scale = (float)UIScreen.MainScreen.Scale;
-
                 return await handler.LoadImageAsync(source, scale: scale, cancelationToken: cancellationToken);
             }
             catch (OperationCanceledException)
             {
-                Log.Warning("Image loading", "Image load cancelled");
+                LoggerHelper.LogEvenIfCantBeResolved(new OperationCanceledException("GetNativeImageAsync was cancelled"));
             }
             catch (Exception ex)
             {
-                Log.Warning("Image loading", $"Image load failed: {ex}");
+                LoggerHelper.LogEvenIfCantBeResolved(new InvalidOperationException("GetNativeImageAsync failed", ex));
             }
 
             return null;

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>2022.6.1</string>
+	<string>2022.6.2</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>

src/iOS.ShareExtension/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.6.1</string>
+	<string>2022.6.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>MinimumOSVersion</key>

src/iOS/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2022.6.1</string>
+	<string>2022.6.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleIconName</key>