Improve error handling for UUID reconstruction

Author: plyght

src/keepass2android-app/ConfigureKeeShareActivity.cs

@@ -5,6 +5,7 @@
 using Android.Content;
 using Android.Content.PM;
 using Android.OS;
+using Android.Util;
 using Android.Views;
 using Android.Widget;
 using Google.Android.Material.Dialog;
@@ -36,7 +37,7 @@ public KeeShareAdapter(ConfigureKeeShareActivity context)
 
             public override Java.Lang.Object GetItem(int position)
             {
-                return position;
+                return _displayedItems[position];
             }
 
             public override long GetItemId(int position)
@@ -241,8 +242,16 @@ protected override void OnCreate(Bundle savedInstanceState)
                 string uuidString = savedInstanceState.GetString(PendingConfigItemUuidKey);
                 if (!string.IsNullOrEmpty(uuidString))
                 {
-                    var uuid = new PwUuid(Convert.FromBase64String(uuidString));
-                    _pendingConfigItem = _adapter._displayedItems.FirstOrDefault(i => i.Group.Uuid.Equals(uuid));
+                    try
+                    {
+                        var uuid = new PwUuid(Convert.FromBase64String(uuidString));
+                        _pendingConfigItem = _adapter._displayedItems.FirstOrDefault(i => i.Group.Uuid.Equals(uuid));
+                    }
+                    catch (Exception ex) when (ex is FormatException || ex is ArgumentException)
+                    {
+                        Log.Error("ConfigureKeeShareActivity", "Failed to reconstruct PwUuid from saved state", ex);
+                        _pendingConfigItem = null;
+                    }
                 }
             }
         }