Step46:画像をアップロードする

keiji · Apr 16, 2020 · 5acf340 · 5acf340
1 parent 7bd6249
commit 5acf340
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 4 deletions.
diff --git a/MastodonClient/app/src/main/java/io/keiji/sample/mastodonclient/MastodonApi.kt b/MastodonClient/app/src/main/java/io/keiji/sample/mastodonclient/MastodonApi.kt
@@ -1,14 +1,18 @@
 package io.keiji.sample.mastodonclient
 
 import io.keiji.sample.mastodonclient.entity.Account
+import io.keiji.sample.mastodonclient.entity.Media
 import io.keiji.sample.mastodonclient.entity.ResponseToken
 import io.keiji.sample.mastodonclient.entity.Toot
+import okhttp3.MultipartBody
 import retrofit2.http.DELETE
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded
 import retrofit2.http.GET
 import retrofit2.http.Header
+import retrofit2.http.Multipart
 import retrofit2.http.POST
+import retrofit2.http.Part
 import retrofit2.http.Path
 import retrofit2.http.Query
 
@@ -36,9 +40,17 @@ interface MastodonApi {
     @POST("api/v1/statuses")
     suspend fun postToot(
             @Header("Authorization") accessToken: String,
-            @Field("status") status: String
+            @Field("status") status: String,
+            @Field("media_ids[]") mediaIds: List<String>? = null
     ): Toot
 
+    @Multipart
+    @POST("api/v1/media")
+    suspend fun postMedia(
+        @Header("Authorization") accessToken: String,
+        @Part file: MultipartBody.Part
+    ): Media
+
     @DELETE("api/v1/statuses/{id}")
     suspend fun deleteToot(
             @Header("Authorization") accessToken: String,
@@ -55,4 +67,5 @@ interface MastodonApi {
             @Field("code") code: String,
             @Field("grant_type") grantType: String
     ): ResponseToken
+
 }
diff --git a/MastodonClient/app/src/main/java/io/keiji/sample/mastodonclient/repository/TootRepository.kt b/MastodonClient/app/src/main/java/io/keiji/sample/mastodonclient/repository/TootRepository.kt
@@ -3,12 +3,17 @@ package io.keiji.sample.mastodonclient.repository
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import io.keiji.sample.mastodonclient.MastodonApi
+import io.keiji.sample.mastodonclient.entity.Media
 import io.keiji.sample.mastodonclient.entity.Toot
 import io.keiji.sample.mastodonclient.entity.UserCredential
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import okhttp3.MediaType
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
+import java.io.File
 
 class TootRepository(
     private val userCredential: UserCredential
@@ -43,11 +48,30 @@ class TootRepository(
     }
 
     suspend fun postToot(
-            status: String
+            status: String,
+            mediaIds: List<String>? = null
     ): Toot = withContext(Dispatchers.IO) {
         return@withContext api.postToot(
                 "Bearer ${userCredential.accessToken}",
-                status
+                status,
+                mediaIds
+        )
+    }
+
+    suspend fun postMedia(
+        file: File,
+        mediaType: String
+    ): Media = withContext(Dispatchers.IO) {
+
+        val part = MultipartBody.Part.createFormData(
+            "file",
+            file.name,
+            RequestBody.create(MediaType.parse(mediaType), file)
+        )
+
+        return@withContext api.postMedia(
+            "Bearer ${userCredential.accessToken}",
+            part
         )
     }
 

diff --git a/...Client/app/src/main/java/io/keiji/sample/mastodonclient/ui/toot_edit/TootEditViewModel.kt b/...Client/app/src/main/java/io/keiji/sample/mastodonclient/ui/toot_edit/TootEditViewModel.kt
@@ -50,8 +50,13 @@ class TootEditViewModel(
 
             val tootRepository = TootRepository(credential)
             try {
+                val uploadedMediaIds = mediaAttachments.value?.map {
+                    tootRepository.postMedia(it.file, it.mediaType)
+                }?.map { it.id }
+
                 tootRepository.postToot(
-                    statusSnapshot
+                    statusSnapshot,
+                    uploadedMediaIds
                 )
                 postComplete.postValue(true)
             } catch (e: HttpException) {
@@ -60,6 +65,10 @@ class TootEditViewModel(
                         errorMessage.postValue("必要な権限がありません")
                     }
                 }
+            } catch (e: IOException) {
+                errorMessage.postValue(
+                    "サーバーに接続できませんでした。${e.message}"
+                )
             }
         }
     }