From f9f2d7c7934ead817b1c57bfeaa5d46d04b01810 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Sun, 24 Jun 2018 00:07:01 +0900
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E5=89=8A=E9=99=A4=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E5=86=8D=E7=B7=A8=E9=9B=86=E3=80=8D=E3=81=A8=E4=B8=80=E9=83=A8?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=82=B9=E3=81=AE=E3=82=A2=E3=83=B3=E3=82=B1?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E6=A9=9F=E8=83=BD=E3=81=AE=E7=B5=84=E3=81=BF?=
 =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E8=BB=BD=E5=BE=AE=E3=81=AA=E3=83=90=E3=82=B0=E3=81=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 +--
 .../java/jp/juggler/subwaytooter/ActPost.kt   | 25 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f9bece11..c70b4114 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 27
 
-        versionCode 259
-        versionName "2.5.9"
+        versionCode 260
+        versionName "2.6.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         // https://stackoverflow.com/questions/47791227/java-lang-illegalstateexception-dex-archives-setting-dex-extension-only-for
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
index 0dfad42e..c5388d20 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
@@ -35,6 +35,7 @@ import android.widget.ImageButton
 import android.widget.ScrollView
 import android.widget.TextView
 import jp.juggler.subwaytooter.api.*
+import jp.juggler.subwaytooter.api.entity.*
 
 import org.apache.commons.io.IOUtils
 import org.json.JSONArray
@@ -51,10 +52,6 @@ import java.util.ArrayList
 import java.util.HashSet
 import java.util.Locale
 
-import jp.juggler.subwaytooter.api.entity.TootAttachment
-import jp.juggler.subwaytooter.api.entity.TootInstance
-import jp.juggler.subwaytooter.api.entity.TootStatus
-import jp.juggler.subwaytooter.api.entity.parseItem
 import jp.juggler.subwaytooter.dialog.*
 import jp.juggler.subwaytooter.table.AcctColor
 import jp.juggler.subwaytooter.table.PostDraft
@@ -627,7 +624,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 				}
 				
 			}
-		
+			
 			// 再編集
 			sv = intent.getStringExtra(KEY_REDRAFT_STATUS)
 			if(sv != null && account != null) {
@@ -645,7 +642,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 							this.attachment_list.clear()
 							try {
 								for(src in src_attachments) {
-									if(src is TootAttachment){
+									if(src is TootAttachment) {
 										src.redraft = true
 										val pa = PostAttachment(src)
 										pa.status = PostAttachment.STATUS_UPLOADED
@@ -667,7 +664,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 						
 						val src_enquete = base_status.enquete
 						val src_items = src_enquete?.items
-						if(src_items != null) {
+						if(src_items != null && src_enquete.type == NicoEnquete.TYPE_ENQUETE ) {
 							cbEnquete.isChecked = true
 							etContent.text = decodeOptions.decodeHTML(src_enquete.question)
 							etContent.setSelection(etContent.text.length)
@@ -676,11 +673,15 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 							for(et in list_etChoice) {
 								if(src_index < src_items.size) {
 									val choice = src_items[src_index]
-									et.setText(decodeOptions.decodeEmoji(choice.text))
-									++ src_index
-								} else {
-									et.setText("")
+									if(src_index == src_items.size - 1 && choice.text == "\uD83E\uDD14") {
+										// :thinking_face: は再現しない
+									} else {
+										et.setText(decodeOptions.decodeEmoji(choice.text))
+										++ src_index
+										continue
+									}
 								}
+								et.setText("")
 							}
 						}
 					}
@@ -1857,7 +1858,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 			val data = Intent()
 			data.putExtra(EXTRA_POSTED_ACCT, target_account.acct)
 			data.putExtra(EXTRA_POSTED_STATUS_ID, status.id)
-			data.putExtra(EXTRA_POSTED_REDRAFT_ID,redraft_status_id)
+			data.putExtra(EXTRA_POSTED_REDRAFT_ID, redraft_status_id)
 			val reply_id = status.in_reply_to_id
 			if(reply_id != null) data.putExtra(EXTRA_POSTED_REPLY_ID, reply_id)
 			setResult(RESULT_OK, data)