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 2018-08-19 14:54:32 +09:00
parent 4f6b1c7f24
commit 4e9efe7ce4
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/jp/juggler/subwaytooter/AppDataExporter.kt
View File

@ -10,6 +10,8 @@ import android.provider.BaseColumns
import android.util.JsonReader
import android.util.JsonToken
import android.util.JsonWriter
import jp.juggler.subwaytooter.api.entity.EntityIdLong
import jp.juggler.subwaytooter.api.entity.EntityIdString
import jp.juggler.subwaytooter.table.*
import org.json.JSONException
@ -70,6 +72,16 @@ object AppDataExporter {
}
is EntityIdLong ->{
writer.name(k)
writer.value(o.toLong())
}
is EntityIdString ->{
writer.name(k)
writer.value(o.toString())
}
else -> throw RuntimeException(
String.format(
Locale.JAPAN,

19
app/src/main/java/jp/juggler/subwaytooter/Column.kt
View File

@ -621,18 +621,25 @@ class Column(
dst.put(KEY_COLUMN_BACKGROUND_IMAGE_ALPHA, column_bg_image_alpha.toDouble())
when(column_type) {
TYPE_CONVERSATION, TYPE_BOOSTED_BY, TYPE_FAVOURITED_BY -> dst.put(
KEY_STATUS_ID,
status_id
)
TYPE_PROFILE -> dst.put(KEY_PROFILE_ID, profile_id).put(KEY_PROFILE_TAB, profile_tab)
TYPE_LIST_MEMBER, TYPE_LIST_TL -> dst.put(KEY_PROFILE_ID, profile_id)
TYPE_CONVERSATION, TYPE_BOOSTED_BY, TYPE_FAVOURITED_BY ->
dst.put(KEY_STATUS_ID,status_id.toString())
TYPE_PROFILE ->
dst.put(KEY_PROFILE_ID, profile_id.toString()).put(KEY_PROFILE_TAB, profile_tab)
TYPE_LIST_MEMBER, TYPE_LIST_TL ->
dst.put(KEY_PROFILE_ID, profile_id.toString())
TYPE_HASHTAG -> dst.put(KEY_HASHTAG, hashtag)
TYPE_SEARCH -> dst.put(KEY_SEARCH_QUERY, search_query).put(
KEY_SEARCH_RESOLVE,
search_resolve
)
TYPE_SEARCH_MSP, TYPE_SEARCH_TS -> dst.put(KEY_SEARCH_QUERY, search_query)
TYPE_INSTANCE_INFORMATION -> dst.put(KEY_INSTANCE_URI, instance_uri)
}