From e51ed68e0b2dcb86c92773b60c5bf219aa77a47e Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Wed, 5 Sep 2018 02:12:36 +0900
Subject: [PATCH] =?UTF-8?q?(Misskey=208.22=E7=A7=BB=E8=A1=8C)=E3=83=AA?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=AE=E5=89=8A=E9=99=A4=E3=81=A8=E5=90=8D?=
 =?UTF-8?q?=E5=89=8D=E3=81=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../subwaytooter/action/Action_List.kt        | 53 ++++++++++---------
 .../subwaytooter/table/SavedAccount.kt        |  2 +-
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9cf50334..2f2e6a16 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/jp/juggler/subwaytooter/action/Action_List.kt b/app/src/main/java/jp/juggler/subwaytooter/action/Action_List.kt
index cdc1ef6a..9ccde65a 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/action/Action_List.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/action/Action_List.kt
@@ -89,10 +89,6 @@ object Action_List {
 		list : TootList,
 		bConfirmed : Boolean = false
 	) {
-		if(access_info.isMisskey) {
-			showToast(activity, false, "Misskey has no API to delete list")
-			return
-		}
 		
 		if(! bConfirmed) {
 			DlgConfirm.openSimple(
@@ -107,7 +103,10 @@ object Action_List {
 		TootTaskRunner(activity).run(access_info, object : TootTask {
 			override fun background(client : TootApiClient) : TootApiResult? {
 				return if(access_info.isMisskey) {
-					TootApiResult("Misskey has no API to delete list")
+					val params = access_info.putMisskeyApiToken()
+						.put("listId", list.id)
+					client.request("/api/users/lists/delete", params.toPostRequestBuilder())
+					// 204 no content
 				} else {
 					client.request("/api/v1/lists/{list.id}", Request.Builder().delete())
 				}
@@ -136,10 +135,6 @@ object Action_List {
 		access_info : SavedAccount,
 		item : TootList
 	) {
-		if(access_info.isMisskey) {
-			showToast(activity, false, "Misskey has no API to rename list")
-			return
-		}
 		
 		DlgTextInput.show(
 			activity,
@@ -154,26 +149,32 @@ object Action_List {
 					
 					TootTaskRunner(activity).run(access_info, object : TootTask {
 						var list : TootList? = null
+						
 						override fun background(client : TootApiClient) : TootApiResult? {
-							if(access_info.isMisskey) {
-								return TootApiResult("Misskey has no API to rename list")
-							}
-							
-							val content = JSONObject()
-							try {
-								content.put("title", text)
-							} catch(ex : Throwable) {
-								return TootApiResult(ex.withCaption("can't encoding json parameter."))
-							}
-							
-							val request_builder = Request.Builder().put(
-								RequestBody.create(
-									TootApiClient.MEDIA_TYPE_JSON, content.toString()
+							val result = if(access_info.isMisskey) {
+								val params = access_info.putMisskeyApiToken()
+									.put("listId", item.id)
+									.put("title", text)
+								client.request(
+									"/api/users/lists/update",
+									params.toPostRequestBuilder()
+								)
+							} else {
+								val content = JSONObject()
+								try {
+									content.put("title", text)
+								} catch(ex : Throwable) {
+									return TootApiResult(ex.withCaption("can't encoding json parameter."))
+								}
+								
+								val request_builder = Request.Builder().put(
+									RequestBody.create(
+										TootApiClient.MEDIA_TYPE_JSON, content.toString()
+									)
 								)
-							)
-							
-							val result =
 								client.request("/api/v1/lists/${item.id}", request_builder)
+							}
+							
 							
 							client.publishApiProgress(activity.getString(R.string.parsing_response))
 							list = parseItem(
diff --git a/app/src/main/java/jp/juggler/subwaytooter/table/SavedAccount.kt b/app/src/main/java/jp/juggler/subwaytooter/table/SavedAccount.kt
index 37a40db8..2489d5da 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/table/SavedAccount.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/table/SavedAccount.kt
@@ -913,7 +913,7 @@ class SavedAccount(
 	val misskeyApiToken : String?
 		get() = token_info?.parseString(TootApiClient.KEY_API_KEY_MISSKEY)
 	
-	fun putMisskeyApiToken(params : JSONObject) : JSONObject {
+	fun putMisskeyApiToken(params : JSONObject =JSONObject()) : JSONObject {
 		val apiKey = misskeyApiToken
 		if(apiKey?.isNotEmpty() == true) params.put("i", apiKey)
 		return params