「削除して再編集」と一部タンスのアンケート機能の組み合わせに関する軽微なバグの修正
This commit is contained in:
parent
4653f5861c
commit
f9f2d7c793
|
@ -12,8 +12,8 @@ android {
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 27
|
targetSdkVersion 27
|
||||||
|
|
||||||
versionCode 259
|
versionCode 260
|
||||||
versionName "2.5.9"
|
versionName "2.6.0"
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
// https://stackoverflow.com/questions/47791227/java-lang-illegalstateexception-dex-archives-setting-dex-extension-only-for
|
// https://stackoverflow.com/questions/47791227/java-lang-illegalstateexception-dex-archives-setting-dex-extension-only-for
|
||||||
|
|
|
@ -35,6 +35,7 @@ import android.widget.ImageButton
|
||||||
import android.widget.ScrollView
|
import android.widget.ScrollView
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import jp.juggler.subwaytooter.api.*
|
import jp.juggler.subwaytooter.api.*
|
||||||
|
import jp.juggler.subwaytooter.api.entity.*
|
||||||
|
|
||||||
import org.apache.commons.io.IOUtils
|
import org.apache.commons.io.IOUtils
|
||||||
import org.json.JSONArray
|
import org.json.JSONArray
|
||||||
|
@ -51,10 +52,6 @@ import java.util.ArrayList
|
||||||
import java.util.HashSet
|
import java.util.HashSet
|
||||||
import java.util.Locale
|
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.dialog.*
|
||||||
import jp.juggler.subwaytooter.table.AcctColor
|
import jp.juggler.subwaytooter.table.AcctColor
|
||||||
import jp.juggler.subwaytooter.table.PostDraft
|
import jp.juggler.subwaytooter.table.PostDraft
|
||||||
|
@ -627,7 +624,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 再編集
|
// 再編集
|
||||||
sv = intent.getStringExtra(KEY_REDRAFT_STATUS)
|
sv = intent.getStringExtra(KEY_REDRAFT_STATUS)
|
||||||
if(sv != null && account != null) {
|
if(sv != null && account != null) {
|
||||||
|
@ -645,7 +642,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
|
||||||
this.attachment_list.clear()
|
this.attachment_list.clear()
|
||||||
try {
|
try {
|
||||||
for(src in src_attachments) {
|
for(src in src_attachments) {
|
||||||
if(src is TootAttachment){
|
if(src is TootAttachment) {
|
||||||
src.redraft = true
|
src.redraft = true
|
||||||
val pa = PostAttachment(src)
|
val pa = PostAttachment(src)
|
||||||
pa.status = PostAttachment.STATUS_UPLOADED
|
pa.status = PostAttachment.STATUS_UPLOADED
|
||||||
|
@ -667,7 +664,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
|
||||||
|
|
||||||
val src_enquete = base_status.enquete
|
val src_enquete = base_status.enquete
|
||||||
val src_items = src_enquete?.items
|
val src_items = src_enquete?.items
|
||||||
if(src_items != null) {
|
if(src_items != null && src_enquete.type == NicoEnquete.TYPE_ENQUETE ) {
|
||||||
cbEnquete.isChecked = true
|
cbEnquete.isChecked = true
|
||||||
etContent.text = decodeOptions.decodeHTML(src_enquete.question)
|
etContent.text = decodeOptions.decodeHTML(src_enquete.question)
|
||||||
etContent.setSelection(etContent.text.length)
|
etContent.setSelection(etContent.text.length)
|
||||||
|
@ -676,11 +673,15 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
|
||||||
for(et in list_etChoice) {
|
for(et in list_etChoice) {
|
||||||
if(src_index < src_items.size) {
|
if(src_index < src_items.size) {
|
||||||
val choice = src_items[src_index]
|
val choice = src_items[src_index]
|
||||||
et.setText(decodeOptions.decodeEmoji(choice.text))
|
if(src_index == src_items.size - 1 && choice.text == "\uD83E\uDD14") {
|
||||||
++ src_index
|
// :thinking_face: は再現しない
|
||||||
} else {
|
} else {
|
||||||
et.setText("")
|
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()
|
val data = Intent()
|
||||||
data.putExtra(EXTRA_POSTED_ACCT, target_account.acct)
|
data.putExtra(EXTRA_POSTED_ACCT, target_account.acct)
|
||||||
data.putExtra(EXTRA_POSTED_STATUS_ID, status.id)
|
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
|
val reply_id = status.in_reply_to_id
|
||||||
if(reply_id != null) data.putExtra(EXTRA_POSTED_REPLY_ID, reply_id)
|
if(reply_id != null) data.putExtra(EXTRA_POSTED_REPLY_ID, reply_id)
|
||||||
setResult(RESULT_OK, data)
|
setResult(RESULT_OK, data)
|
||||||
|
|
Loading…
Reference in New Issue