Profile fileds のラベルはカスタム絵文字を表示しない

app/build.gradle

@@ -12,8 +12,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 27
 
-        versionCode 245
-        versionName "2.4.5"
+        versionCode 246
+        versionName "2.4.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         // https://stackoverflow.com/questions/47791227/java-lang-illegalstateexception-dex-archives-setting-dex-extension-only-for

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

@@ -803,6 +803,12 @@ class ActAccountSetting
 				emojiMapProfile = src.profile_emojis,
 				emojiMapCustom = src.custom_emojis
 			)
+			// fieldsのnameにはカスタム絵文字が適用されない
+			val decodeOptionsNoCustomEmoji = DecodeOptions(
+				context = this@ActAccountSetting,
+				linkHelper = account,
+				emojiMapProfile = src.profile_emojis
+			)
 			
 			val display_name = src.display_name
 			val name = decodeOptions.decodeEmoji(display_name)
@@ -829,7 +835,7 @@ class ActAccountSetting
 			if(src.source?.fields != null) {
 				val fields = src.source.fields
 				listEtFieldName.forEachIndexed { i, et ->
-					val text = decodeOptions.decodeEmoji(
+					val text = decodeOptionsNoCustomEmoji.decodeEmoji(
 						when {
 							i >= fields.size -> ""
 							else -> fields[i].first
@@ -858,7 +864,7 @@ class ActAccountSetting
 				val fields = src.fields
 				
 				listEtFieldName.forEachIndexed { i, et ->
-					val text = 	decodeOptions.decodeEmoji(
+					val text = 	decodeOptionsNoCustomEmoji.decodeEmoji(
 						when {
 							fields == null || i >= fields.size -> ""
 							else -> fields[i].first

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

@@ -236,6 +236,16 @@ internal class ViewHolderHeaderProfile(
 					emojiMapProfile = who.profile_emojis
 				)
 				
+				// fieldsのnameにはカスタム絵文字が適用されない
+				val decodeOptionsNoCustomEmoji = DecodeOptions(
+					context = activity,
+					decodeEmoji = true,
+					linkHelper = access_info,
+					short = true,
+					emojiMapProfile = who.profile_emojis
+				)
+
+
 				val content_color = column.content_color
 				val c = if(content_color != 0) content_color else default_color
 				
@@ -250,7 +260,7 @@ internal class ViewHolderHeaderProfile(
 						LinearLayout.LayoutParams.MATCH_PARENT,
 						LinearLayout.LayoutParams.WRAP_CONTENT
 					)
-					val nameText = decodeOptions.decodeEmoji(item.first)
+					val nameText = decodeOptionsNoCustomEmoji.decodeEmoji(item.first)
 					val nameInvalidator = NetworkEmojiInvalidator(activity.handler, nameView)
 					nameInvalidator.register(nameText)
 					

app/src/main/java/jp/juggler/subwaytooter/util/HTMLDecoder.kt

@@ -406,7 +406,7 @@ object HTMLDecoder {
 						return "@" + m.group(2) + "@" + m.group(1)
 					}
 				}
-				// ハッシュタグやメンションは変更しない
+				// ハッシュタグやメンションはURLの短縮表示の対象外
 				return display_url
 			}