Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-02-07 06:04:23 +01:00
Code Issues Releases Wiki Activity

クラッシュレポート対応

Browse Source
This commit is contained in:
tateisu 2019-12-02 11:24:39 +09:00
parent 1d91ae1b0b
commit e22928e142
1 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
View File

@ -941,6 +941,9 @@ class ActAccountSetting
var profile_busy : Boolean = false
internal fun showProfile(src : TootAccount) {
if( isDestroyed ) return
profile_busy = true
try {
ivProfileAvatar.setImageUrl(
@ -997,6 +1000,8 @@ class ActAccountSetting
if(src.source?.fields != null) {
val fields = src.source.fields
listEtFieldName.forEachIndexed { i, et ->
val handler =et.handler // may null
if( handler != null){
// いつからかfields name にもカスタム絵文字が使えるようになった
// https://github.com/tootsuite/mastodon/pull/11350
// しかし
@ -1008,11 +1013,14 @@ class ActAccountSetting
)
et.setText(text)
et.isEnabled = true
val invalidator = NetworkEmojiInvalidator(et.handler, et)
val invalidator = NetworkEmojiInvalidator(handler, et)
invalidator.register(text)
}
}
listEtFieldValue.forEachIndexed { i, et ->
val handler =et.handler // may null
if( handler != null){
val text = decodeOptions.decodeEmoji(
when {
i >= fields.size -> ""
@ -1021,14 +1029,17 @@ class ActAccountSetting
)
et.setText(text)
et.isEnabled = true
val invalidator = NetworkEmojiInvalidator(et.handler, et)
val invalidator = NetworkEmojiInvalidator(handler, et)
invalidator.register(text)
}
}
} else {
val fields = src.fields
listEtFieldName.forEachIndexed { i, et ->
val handler =et.handler // may null
if( handler != null){
// いつからかfields name にもカスタム絵文字が使えるようになった
// https://github.com/tootsuite/mastodon/pull/11350
val text = decodeOptions.decodeEmoji(
@ -1039,11 +1050,15 @@ class ActAccountSetting
)
et.setText(text)
et.isEnabled = true
val invalidator = NetworkEmojiInvalidator(et.handler, et)
val invalidator = NetworkEmojiInvalidator(handler, et)
invalidator.register(text)
}
}
listEtFieldValue.forEachIndexed { i, et ->
val handler =et.handler // may null
if( handler != null){
val text = decodeOptions.decodeHTML(
when {
fields == null || i >= fields.size -> ""
@ -1052,10 +1067,11 @@ class ActAccountSetting
)
et.text = text
et.isEnabled = true
val invalidator = NetworkEmojiInvalidator(et.handler, et)
val invalidator = NetworkEmojiInvalidator(handler, et)
invalidator.register(text)
}
}
}
} finally {
profile_busy = false