From 65bd88af72d5a5998fdecc47c3d6615e05610191 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Sat, 11 Jan 2020 17:14:27 +0100
Subject: [PATCH] changes to search provider, mainly removing special
 characters from suggestion as several users are reporting crashes on Android
 9 when Tabs are in the notes

---
 src/keepass2android/search/SearchProvider.cs | 74 ++++++++++++--------
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/keepass2android/search/SearchProvider.cs b/src/keepass2android/search/SearchProvider.cs
index 0825a59e..32202b84 100644
--- a/src/keepass2android/search/SearchProvider.cs
+++ b/src/keepass2android/search/SearchProvider.cs
@@ -263,8 +263,8 @@ namespace keepass2android.search
 			{
 				get
 				{
-                    if (MPos < _entriesWithContexts.Count)
-					    return _entriesWithContexts[MPos].entry;
+                    if ((Position < _entriesWithContexts.Count) && (Position >= 0))
+					    return _entriesWithContexts[Position].entry;
                     return null;
                     
 				}
@@ -275,7 +275,7 @@ namespace keepass2android.search
 				switch (column)
 				{
 					case 0: // _ID
-						return MPos;
+						return Position;
 					default:
 						throw new FormatException();
 				}
@@ -283,30 +283,40 @@ namespace keepass2android.search
 
 			public override string GetString(int column)
 			{
-				switch (column)
-				{
-					case 0: // _ID
-						return MPos.ToString(CultureInfo.InvariantCulture);
-					case 1: // SuggestColumnText1
-						return CurrentEntry.Strings.ReadSafe(PwDefs.TitleField);
-					case 2: // SuggestColumnText2
-                        if (MPos < _entriesWithContexts.Count)
-                            return Internationalise(_entriesWithContexts[MPos].resultContext);
-					    return "";
-					case 3: // SuggestColumnIcon1
-						var builder = new Android.Net.Uri.Builder();
-						builder.Scheme(ContentResolver.SchemeContent);
-						builder.Authority(Authority);
-						builder.Path(GetIconPathQuery);
-						builder.AppendQueryParameter(IconIdParameter, CurrentEntry.IconId.ToString());
-						builder.AppendQueryParameter(CustomIconUuidParameter, CurrentEntry.CustomIconUuid.ToHexString());
-					    builder.AppendQueryParameter(DatabaseIndexParameter, _entriesWithContexts[MPos].DatabaseIndex.ToString());
-                        return builder.Build().ToString();
-					case 4: // SuggestColumnIntentDataId
-						return new ElementAndDatabaseId(App.Kp2a.FindDatabaseForElement(CurrentEntry),CurrentEntry).FullId;
-					default:
-						return null;
-				}
+                try
+                {
+                    if ((Position >= _entriesWithContexts.Count) || (Position < 0))
+                        return "";
+
+                    switch (column)
+                    {
+                        case 0: // _ID
+                            return Position.ToString(CultureInfo.InvariantCulture);
+                        case 1: // SuggestColumnText1
+                            return CurrentEntry.Strings.ReadSafe(PwDefs.TitleField);
+                        case 2: // SuggestColumnText2
+                                return Internationalise(_entriesWithContexts[Position].resultContext);
+                        case 3: // SuggestColumnIcon1
+                            var builder = new Android.Net.Uri.Builder();
+                            builder.Scheme(ContentResolver.SchemeContent);
+                            builder.Authority(Authority);
+                            builder.Path(GetIconPathQuery);
+                            builder.AppendQueryParameter(IconIdParameter, CurrentEntry.IconId.ToString());
+                            builder.AppendQueryParameter(CustomIconUuidParameter, CurrentEntry.CustomIconUuid.ToHexString());
+                            builder.AppendQueryParameter(DatabaseIndexParameter, _entriesWithContexts[Position].DatabaseIndex.ToString());
+                            return builder.Build().ToString();
+                        case 4: // SuggestColumnIntentDataId
+                            return new ElementAndDatabaseId(App.Kp2a.FindDatabaseForElement(CurrentEntry), CurrentEntry).FullId;
+                        default:
+                            return null;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Kp2aLog.LogUnexpectedError(e);
+                    return "(error retrieving data)";
+                }
+				
 			}
 
 			private string Internationalise(KeyValuePair<string, string> context)
@@ -340,11 +350,15 @@ namespace keepass2android.search
 							break;
 					}
 
-					if (intlResourceId > 0)
+                    string value = context.Value;
+                    value = value.Replace("\t", "");
+                    value = value.Replace("\n", "");
+                    value = value.Replace("\r", "");
+                    if (intlResourceId > 0)
 					{
-						return Application.Context.GetString(intlResourceId) + ": "+context.Value;
+						return Application.Context.GetString(intlResourceId) + ": "+value;
 					}
-					return context.Key + ": " + context.Value;
+					return context.Key + ": " + value;
 				}
 				catch (Exception)
 				{