From b2b50bacd80fde036367864ac19cabbb3324f913 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 30 Sep 2019 02:34:19 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5?=
 =?UTF-8?q?=E3=83=AC=E3=83=9D=E3=83=BC=E3=83=88=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/jp/juggler/subwaytooter/api/TootApiClient.kt    | 3 +--
 .../main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt b/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
index eb2cf711..b5602cc4 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
@@ -1178,8 +1178,7 @@ class TootApiClient(
 		
 	}
 	
-	// アクセストークン手動入力でアカウントを更新する場合
-	// verify_credentialsを呼び出す
+	// アクセストークン手動入力でアカウントを更新する場合、アカウントの情報を取得する
 	fun getUserCredential(
 		access_token : String
 		, tokenInfo : JSONObject = JSONObject()
diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt b/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt
index 71f34e6b..b062f635 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt
@@ -455,7 +455,8 @@ class EmojiPicker(
 					view = viewOld
 				}
 				view.setTag(R.id.btnAbout, item)
-				if(view is ImageView) {
+				if(view is ImageView && view.activity?.isDestroyed == false ) {
+					
 					val name = if(page.hasSkinTone) {
 						applySkinTone(item.name)
 					} else {
@@ -468,7 +469,6 @@ class EmojiPicker(
 						if(er.isSvg) {
 							Glide.with(activity)
 								.`as`(PictureDrawable::class.java)
-								
 								.load("file:///android_asset/${er.assetsName}")
 								.into(view)
 						} else {