From 02195d0c6cc539b18acdd2c5dd717172bc63929c Mon Sep 17 00:00:00 2001 From: tateisu Date: Fri, 6 Dec 2019 17:04:33 +0900 Subject: [PATCH] =?UTF-8?q?=E9=81=B8=E6=8A=9E=E3=81=97=E3=81=A6=E3=82=B3?= =?UTF-8?q?=E3=83=94=E3=83=BC=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?= =?UTF-8?q?json=E3=83=87=E3=83=BC=E3=82=BF=E3=82=92=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=83=87=E3=83=B3=E3=83=88=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jp/juggler/subwaytooter/api/entity/TootAccount.kt | 4 ++++ .../java/jp/juggler/subwaytooter/util/TootTextEncoder.kt | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt index d9a34408..5c0df419 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAccount.kt @@ -111,7 +111,11 @@ open class TootAccount(parser : TootParser, src : JSONObject) { // last_status_at : "2019-08-29T12:42:08.838Z" or null var last_status_at = 0L + val json : JSONObject + init { + this.json = src + var sv : String? if(parser.serviceType == ServiceType.MISSKEY) { diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/TootTextEncoder.kt b/app/src/main/java/jp/juggler/subwaytooter/util/TootTextEncoder.kt index 061361c5..3ef87f85 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/util/TootTextEncoder.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/util/TootTextEncoder.kt @@ -71,8 +71,7 @@ object TootTextEncoder { dumpAttachment(sb, status.media_attachments) - sb.addAfterLine( String.format(Locale.JAPAN, "Status-Source: %s", status.json)) - + sb.addAfterLine( String.format(Locale.JAPAN, "Status-Source: %s", status.json.toString(2))) sb.addAfterLine( "") intent.putExtra(ActText.EXTRA_TEXT, sb.toString()) } @@ -298,7 +297,9 @@ object TootTextEncoder { ) addHeader(context, sb, R.string.send_header_account_locked, who.locked) - sb.addAfterLine("") + sb.addAfterLine( String.format(Locale.JAPAN, "Account-Source: %s", who.json.toString(2))) + sb.addAfterLine( "") + intent.putExtra(ActText.EXTRA_TEXT, sb.toString()) }