Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

クラッシュレポート対応

This commit is contained in:
tateisu 2019-09-30 02:34:19 +09:00
parent 5ed57dd286
commit b2b50bacd8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
View File

@ -1178,8 +1178,7 @@ class TootApiClient(
} }
// アクセストークン手動入力でアカウントを更新する場合 // アクセストークン手動入力でアカウントを更新する場合、アカウントの情報を取得する
// verify_credentialsを呼び出す
fun getUserCredential( fun getUserCredential(
access_token : String access_token : String
, tokenInfo : JSONObject = JSONObject() , tokenInfo : JSONObject = JSONObject()

4
app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt
View File

@ -455,7 +455,8 @@ class EmojiPicker(
view = viewOld view = viewOld
} }
view.setTag(R.id.btnAbout, item) view.setTag(R.id.btnAbout, item)
if(view is ImageView) { if(view is ImageView && view.activity?.isDestroyed == false ) {
val name = if(page.hasSkinTone) { val name = if(page.hasSkinTone) {
applySkinTone(item.name) applySkinTone(item.name)
} else { } else {
@ -468,7 +469,6 @@ class EmojiPicker(
if(er.isSvg) { if(er.isSvg) {
Glide.with(activity) Glide.with(activity)
.`as`(PictureDrawable::class.java) .`as`(PictureDrawable::class.java)
.load("file:///android_asset/${er.assetsName}") .load("file:///android_asset/${er.assetsName}")
.into(view) .into(view)
} else { } else {