refactor

app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt

@@ -1114,7 +1114,7 @@ internal class ItemViewHolder(
 			whoRef.decoded_display_name
 		}.intoStringResource(activity, string_id)
 		
-		val emojiResource = misskeyReaction.emojiResource
+		val emojiResource = misskeyReaction?.emojiResource
 		if(emojiResource != null) {
 			emojiResource.loadToImageView(activity, ivBoosted)
 			// TODO パディング少し変える？

app/src/main/java/jp/juggler/util/CharacterGroup.kt

@@ -24,29 +24,18 @@ object CharacterGroup {
 	
 	private val mapWhitespace = SparseBooleanArray().apply {
 		intArrayOf(
-			0x0009 // HORIZONTAL TABULATION
-			,
-			0x000A // LINE FEED
-			,
-			0x000B // VERTICAL TABULATION
-			,
-			0x000C // FORM FEED
-			,
-			0x000D // CARRIAGE RETURN
-			,
-			0x001C // FILE SEPARATOR
-			,
-			0x001D // GROUP SEPARATOR
-			,
-			0x001E // RECORD SEPARATOR
-			,
-			0x001F // UNIT SEPARATOR
-			,
+			0x0009, // HORIZONTAL TABULATION
+			0x000A, // LINE FEED
+			0x000B, // VERTICAL TABULATION
+			0x000C, // FORM FEED
+			0x000D, // CARRIAGE RETURN
+			0x001C, // FILE SEPARATOR
+			0x001D, // GROUP SEPARATOR
+			0x001E, // RECORD SEPARATOR
+			0x001F, // UNIT SEPARATOR
 			0x0020,
-			0x0085 // next line (latin-1)
-			,
-			0x00A0 //非区切りスペース
-			,
+			0x0085, // next line (latin-1)
+			0x00A0, //非区切りスペース
 			0x1680,
 			0x180E,
 			0x2000,
@@ -56,20 +45,16 @@ object CharacterGroup {
 			0x2004,
 			0x2005,
 			0x2006,
-			0x2007 //非区切りスペース
-			,
+			0x2007, //非区切りスペース
 			0x2008,
 			0x2009,
 			0x200A,
 			0x200B,
 			0x200C,
 			0x200D,
-			0x2028 // line separator
-			,
-			0x2029 // paragraph separator
-			,
-			0x202F //非区切りスペース
-			,
+			0x2028, // line separator
+			0x2029, // paragraph separator
+			0x202F, //非区切りスペース
 			0x205F,
 			0x2060,
 			0x3000,
@@ -84,16 +69,16 @@ object CharacterGroup {
 	fun isWhitespace(cp : Int) : Boolean = mapWhitespace.get(cp, false)
 	
 	internal val reWhitespace by lazy {
-		Pattern.compile(
+		val quotedKeys = Pattern.quote(
 			StringBuilder().apply {
-				append("[\\s\\t\\x0d\\x0a")
-				for(i in 0 until mapWhitespace.size()) {
-					val k = mapWhitespace.keyAt(i)
-					if(k > 0x20) append(k.toChar())
+				val size = mapWhitespace.size()
+				ensureCapacity(size)
+				for(i in 0 until size) {
+					append(mapWhitespace.keyAt(i).toChar())
 				}
-				append("]+")
 			}.toString()
 		)
+		Pattern.compile("[${quotedKeys}]+")
 	}
 	
 	private fun SparseBooleanArray.keys() = (0 until size()).map { keyAt(it) }