From 713c51009ac820bf620551b63bd2b343f617ae80 Mon Sep 17 00:00:00 2001
From: Kieran W <41634689+FredHappyface@users.noreply.github.com>
Date: Mon, 17 Feb 2025 19:21:11 +0000
Subject: [PATCH] fix cache bug where fresh installs include 1 null recent
 sticker

---
 .../main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt | 2 +-
 .../java/com/fredhappyface/ewesticker/utilities/Cache.kt    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt b/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt
index 34560d3..0dc9736 100644
--- a/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt
+++ b/app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt
@@ -506,7 +506,7 @@ class ImageKeyboard : InputMethodService(), StickerClickListener {
 	 *  @param sticker: File
 	 */
 	override fun onStickerClicked(sticker: File) {
-		this.recentCache.add(sticker.absolutePath)
+		this.recentCache.add(sticker.path)
 		this.stickerSender.sendSticker(sticker)
 	}
 
diff --git a/app/src/main/java/com/fredhappyface/ewesticker/utilities/Cache.kt b/app/src/main/java/com/fredhappyface/ewesticker/utilities/Cache.kt
index b717f49..28da2e5 100644
--- a/app/src/main/java/com/fredhappyface/ewesticker/utilities/Cache.kt
+++ b/app/src/main/java/com/fredhappyface/ewesticker/utilities/Cache.kt
@@ -5,7 +5,7 @@ import java.util.ArrayDeque
 import java.util.Deque
 
 /**
- * Basically this behaved like an ordered set with some maximum capacity. When this capacity is
+ * Basically this behaves like an ordered set with some maximum capacity. When this capacity is
  * exceeded an element is removed from the start
  */
 class Cache(private val capacity: Int = 30) {
@@ -49,6 +49,8 @@ class Cache(private val capacity: Int = 30) {
 	/** convert from a string (shared-pref) to this */
 	fun fromSharedPref(raw: String) {
 		data.clear()
-		data.addAll(raw.split("\n"))
+		if (raw.trim().isNotEmpty()) {
+			data.addAll(raw.split("\n"))
+		}
 	}
 }