upgrade ktlint plugin to 12.0.3 (#4169)
There are some new rules, I think they mostly make sense, except for the max line length which I had to disable because we are over it in a lot of places. --------- Co-authored-by: Goooler <wangzongler@gmail.com>
This commit is contained in:
Konrad Pozniak
GitHub
parent
33cd6fdb98
commit
5192fb08a5
215 changed files with 2813 additions and 1177 deletions
|
|
@ -17,6 +17,7 @@ package com.keylesspalace.tusky.network
|
|||
|
||||
import android.util.Log
|
||||
import com.keylesspalace.tusky.db.AccountManager
|
||||
import java.io.IOException
|
||||
import okhttp3.HttpUrl
|
||||
import okhttp3.Interceptor
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
|
|
@ -24,7 +25,6 @@ import okhttp3.Protocol
|
|||
import okhttp3.Request
|
||||
import okhttp3.Response
|
||||
import okhttp3.ResponseBody.Companion.toResponseBody
|
||||
import java.io.IOException
|
||||
|
||||
class InstanceSwitchAuthInterceptor(private val accountManager: AccountManager) : Interceptor {
|
||||
|
||||
|
|
@ -57,7 +57,10 @@ class InstanceSwitchAuthInterceptor(private val accountManager: AccountManager)
|
|||
val newRequest: Request = builder.build()
|
||||
|
||||
if (MastodonApi.PLACEHOLDER_DOMAIN == newRequest.url.host) {
|
||||
Log.w("ISAInterceptor", "no user logged in or no domain header specified - can't make request to " + newRequest.url)
|
||||
Log.w(
|
||||
"ISAInterceptor",
|
||||
"no user logged in or no domain header specified - can't make request to " + newRequest.url
|
||||
)
|
||||
return Response.Builder()
|
||||
.code(400)
|
||||
.message("Bad Request")
|
||||
|
|
|
|||
|
|
@ -85,7 +85,9 @@ interface MastodonApi {
|
|||
suspend fun getCustomEmojis(): NetworkResult<List<Emoji>>
|
||||
|
||||
@GET("api/v1/instance")
|
||||
suspend fun getInstanceV1(@Header(DOMAIN_HEADER) domain: String? = null): NetworkResult<InstanceV1>
|
||||
suspend fun getInstanceV1(
|
||||
@Header(DOMAIN_HEADER) domain: String? = null
|
||||
): NetworkResult<InstanceV1>
|
||||
|
||||
@GET("api/v2/instance")
|
||||
suspend fun getInstance(): NetworkResult<Instance>
|
||||
|
|
@ -94,9 +96,7 @@ interface MastodonApi {
|
|||
suspend fun getFiltersV1(): NetworkResult<List<FilterV1>>
|
||||
|
||||
@GET("api/v2/filters/{filterId}")
|
||||
suspend fun getFilter(
|
||||
@Path("filterId") filterId: String
|
||||
): NetworkResult<Filter>
|
||||
suspend fun getFilter(@Path("filterId") filterId: String): NetworkResult<Filter>
|
||||
|
||||
@GET("api/v2/filters")
|
||||
suspend fun getFilters(): NetworkResult<List<Filter>>
|
||||
|
|
@ -158,9 +158,7 @@ interface MastodonApi {
|
|||
|
||||
/** Fetch a single notification */
|
||||
@GET("api/v1/notifications/{id}")
|
||||
suspend fun notification(
|
||||
@Path("id") id: String
|
||||
): Response<Notification>
|
||||
suspend fun notification(@Path("id") id: String): Response<Notification>
|
||||
|
||||
@GET("api/v1/markers")
|
||||
suspend fun markersWithAuth(
|
||||
|
|
@ -201,9 +199,7 @@ interface MastodonApi {
|
|||
): NetworkResult<Attachment>
|
||||
|
||||
@GET("api/v1/media/{mediaId}")
|
||||
suspend fun getMedia(
|
||||
@Path("mediaId") mediaId: String
|
||||
): Response<MediaUploadResult>
|
||||
suspend fun getMedia(@Path("mediaId") mediaId: String): Response<MediaUploadResult>
|
||||
|
||||
@POST("api/v1/statuses")
|
||||
suspend fun createStatus(
|
||||
|
|
@ -214,9 +210,7 @@ interface MastodonApi {
|
|||
): NetworkResult<Status>
|
||||
|
||||
@GET("api/v1/statuses/{id}")
|
||||
suspend fun status(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun status(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@PUT("api/v1/statuses/{id}")
|
||||
suspend fun editStatus(
|
||||
|
|
@ -228,24 +222,16 @@ interface MastodonApi {
|
|||
): NetworkResult<Status>
|
||||
|
||||
@GET("api/v1/statuses/{id}")
|
||||
suspend fun statusAsync(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun statusAsync(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@GET("api/v1/statuses/{id}/source")
|
||||
suspend fun statusSource(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<StatusSource>
|
||||
suspend fun statusSource(@Path("id") statusId: String): NetworkResult<StatusSource>
|
||||
|
||||
@GET("api/v1/statuses/{id}/context")
|
||||
suspend fun statusContext(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<StatusContext>
|
||||
suspend fun statusContext(@Path("id") statusId: String): NetworkResult<StatusContext>
|
||||
|
||||
@GET("api/v1/statuses/{id}/history")
|
||||
suspend fun statusEdits(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<List<StatusEdit>>
|
||||
suspend fun statusEdits(@Path("id") statusId: String): NetworkResult<List<StatusEdit>>
|
||||
|
||||
@GET("api/v1/statuses/{id}/reblogged_by")
|
||||
suspend fun statusRebloggedBy(
|
||||
|
|
@ -260,99 +246,61 @@ interface MastodonApi {
|
|||
): Response<List<TimelineAccount>>
|
||||
|
||||
@DELETE("api/v1/statuses/{id}")
|
||||
suspend fun deleteStatus(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<DeletedStatus>
|
||||
suspend fun deleteStatus(@Path("id") statusId: String): NetworkResult<DeletedStatus>
|
||||
|
||||
@POST("api/v1/statuses/{id}/reblog")
|
||||
suspend fun reblogStatus(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun reblogStatus(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/unreblog")
|
||||
suspend fun unreblogStatus(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun unreblogStatus(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/favourite")
|
||||
suspend fun favouriteStatus(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun favouriteStatus(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/unfavourite")
|
||||
suspend fun unfavouriteStatus(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun unfavouriteStatus(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/bookmark")
|
||||
suspend fun bookmarkStatus(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun bookmarkStatus(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/unbookmark")
|
||||
suspend fun unbookmarkStatus(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun unbookmarkStatus(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/reblog")
|
||||
fun reblogStatusOld(
|
||||
@Path("id") statusId: String
|
||||
): Single<Status>
|
||||
fun reblogStatusOld(@Path("id") statusId: String): Single<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/unreblog")
|
||||
fun unreblogStatusOld(
|
||||
@Path("id") statusId: String
|
||||
): Single<Status>
|
||||
fun unreblogStatusOld(@Path("id") statusId: String): Single<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/favourite")
|
||||
fun favouriteStatusOld(
|
||||
@Path("id") statusId: String
|
||||
): Single<Status>
|
||||
fun favouriteStatusOld(@Path("id") statusId: String): Single<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/unfavourite")
|
||||
fun unfavouriteStatusOld(
|
||||
@Path("id") statusId: String
|
||||
): Single<Status>
|
||||
fun unfavouriteStatusOld(@Path("id") statusId: String): Single<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/bookmark")
|
||||
fun bookmarkStatusOld(
|
||||
@Path("id") statusId: String
|
||||
): Single<Status>
|
||||
fun bookmarkStatusOld(@Path("id") statusId: String): Single<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/unbookmark")
|
||||
fun unbookmarkStatusOld(
|
||||
@Path("id") statusId: String
|
||||
): Single<Status>
|
||||
fun unbookmarkStatusOld(@Path("id") statusId: String): Single<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/pin")
|
||||
suspend fun pinStatus(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun pinStatus(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/unpin")
|
||||
suspend fun unpinStatus(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun unpinStatus(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/mute")
|
||||
suspend fun muteConversation(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun muteConversation(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/unmute")
|
||||
suspend fun unmuteConversation(
|
||||
@Path("id") statusId: String
|
||||
): NetworkResult<Status>
|
||||
suspend fun unmuteConversation(@Path("id") statusId: String): NetworkResult<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/mute")
|
||||
fun muteConversationOld(
|
||||
@Path("id") statusId: String
|
||||
): Single<Status>
|
||||
fun muteConversationOld(@Path("id") statusId: String): Single<Status>
|
||||
|
||||
@POST("api/v1/statuses/{id}/unmute")
|
||||
fun unmuteConversationOld(
|
||||
@Path("id") statusId: String
|
||||
): Single<Status>
|
||||
fun unmuteConversationOld(@Path("id") statusId: String): Single<Status>
|
||||
|
||||
@GET("api/v1/scheduled_statuses")
|
||||
fun scheduledStatuses(
|
||||
|
|
@ -414,9 +362,7 @@ interface MastodonApi {
|
|||
): NetworkResult<List<TimelineAccount>>
|
||||
|
||||
@GET("api/v1/accounts/{id}")
|
||||
suspend fun account(
|
||||
@Path("id") accountId: String
|
||||
): NetworkResult<Account>
|
||||
suspend fun account(@Path("id") accountId: String): NetworkResult<Account>
|
||||
|
||||
/**
|
||||
* Method to fetch statuses for the specified account.
|
||||
|
|
@ -459,19 +405,13 @@ interface MastodonApi {
|
|||
): NetworkResult<Relationship>
|
||||
|
||||
@POST("api/v1/accounts/{id}/unfollow")
|
||||
suspend fun unfollowAccount(
|
||||
@Path("id") accountId: String
|
||||
): NetworkResult<Relationship>
|
||||
suspend fun unfollowAccount(@Path("id") accountId: String): NetworkResult<Relationship>
|
||||
|
||||
@POST("api/v1/accounts/{id}/block")
|
||||
suspend fun blockAccount(
|
||||
@Path("id") accountId: String
|
||||
): NetworkResult<Relationship>
|
||||
suspend fun blockAccount(@Path("id") accountId: String): NetworkResult<Relationship>
|
||||
|
||||
@POST("api/v1/accounts/{id}/unblock")
|
||||
suspend fun unblockAccount(
|
||||
@Path("id") accountId: String
|
||||
): NetworkResult<Relationship>
|
||||
suspend fun unblockAccount(@Path("id") accountId: String): NetworkResult<Relationship>
|
||||
|
||||
@FormUrlEncoded
|
||||
@POST("api/v1/accounts/{id}/mute")
|
||||
|
|
@ -482,9 +422,7 @@ interface MastodonApi {
|
|||
): NetworkResult<Relationship>
|
||||
|
||||
@POST("api/v1/accounts/{id}/unmute")
|
||||
suspend fun unmuteAccount(
|
||||
@Path("id") accountId: String
|
||||
): NetworkResult<Relationship>
|
||||
suspend fun unmuteAccount(@Path("id") accountId: String): NetworkResult<Relationship>
|
||||
|
||||
@GET("api/v1/accounts/relationships")
|
||||
suspend fun relationships(
|
||||
|
|
@ -492,24 +430,16 @@ interface MastodonApi {
|
|||
): NetworkResult<List<Relationship>>
|
||||
|
||||
@POST("api/v1/pleroma/accounts/{id}/subscribe")
|
||||
suspend fun subscribeAccount(
|
||||
@Path("id") accountId: String
|
||||
): NetworkResult<Relationship>
|
||||
suspend fun subscribeAccount(@Path("id") accountId: String): NetworkResult<Relationship>
|
||||
|
||||
@POST("api/v1/pleroma/accounts/{id}/unsubscribe")
|
||||
suspend fun unsubscribeAccount(
|
||||
@Path("id") accountId: String
|
||||
): NetworkResult<Relationship>
|
||||
suspend fun unsubscribeAccount(@Path("id") accountId: String): NetworkResult<Relationship>
|
||||
|
||||
@GET("api/v1/blocks")
|
||||
suspend fun blocks(
|
||||
@Query("max_id") maxId: String?
|
||||
): Response<List<TimelineAccount>>
|
||||
suspend fun blocks(@Query("max_id") maxId: String?): Response<List<TimelineAccount>>
|
||||
|
||||
@GET("api/v1/mutes")
|
||||
suspend fun mutes(
|
||||
@Query("max_id") maxId: String?
|
||||
): Response<List<TimelineAccount>>
|
||||
suspend fun mutes(@Query("max_id") maxId: String?): Response<List<TimelineAccount>>
|
||||
|
||||
@GET("api/v1/domain_blocks")
|
||||
suspend fun domainBlocks(
|
||||
|
|
@ -520,9 +450,7 @@ interface MastodonApi {
|
|||
|
||||
@FormUrlEncoded
|
||||
@POST("api/v1/domain_blocks")
|
||||
suspend fun blockDomain(
|
||||
@Field("domain") domain: String
|
||||
): NetworkResult<Unit>
|
||||
suspend fun blockDomain(@Field("domain") domain: String): NetworkResult<Unit>
|
||||
|
||||
@FormUrlEncoded
|
||||
// @DELETE doesn't support fields
|
||||
|
|
@ -544,19 +472,13 @@ interface MastodonApi {
|
|||
): Response<List<Status>>
|
||||
|
||||
@GET("api/v1/follow_requests")
|
||||
suspend fun followRequests(
|
||||
@Query("max_id") maxId: String?
|
||||
): Response<List<TimelineAccount>>
|
||||
suspend fun followRequests(@Query("max_id") maxId: String?): Response<List<TimelineAccount>>
|
||||
|
||||
@POST("api/v1/follow_requests/{id}/authorize")
|
||||
fun authorizeFollowRequest(
|
||||
@Path("id") accountId: String
|
||||
): Single<Relationship>
|
||||
fun authorizeFollowRequest(@Path("id") accountId: String): Single<Relationship>
|
||||
|
||||
@POST("api/v1/follow_requests/{id}/reject")
|
||||
fun rejectFollowRequest(
|
||||
@Path("id") accountId: String
|
||||
): Single<Relationship>
|
||||
fun rejectFollowRequest(@Path("id") accountId: String): Single<Relationship>
|
||||
|
||||
@FormUrlEncoded
|
||||
@POST("api/v1/apps")
|
||||
|
|
@ -600,7 +522,7 @@ interface MastodonApi {
|
|||
suspend fun createList(
|
||||
@Field("title") title: String,
|
||||
@Field("exclusive") exclusive: Boolean?,
|
||||
@Field("replies_policy") replyPolicy: String,
|
||||
@Field("replies_policy") replyPolicy: String
|
||||
): NetworkResult<MastoList>
|
||||
|
||||
@FormUrlEncoded
|
||||
|
|
@ -609,13 +531,11 @@ interface MastodonApi {
|
|||
@Path("listId") listId: String,
|
||||
@Field("title") title: String,
|
||||
@Field("exclusive") exclusive: Boolean?,
|
||||
@Field("replies_policy") replyPolicy: String,
|
||||
@Field("replies_policy") replyPolicy: String
|
||||
): NetworkResult<MastoList>
|
||||
|
||||
@DELETE("api/v1/lists/{listId}")
|
||||
suspend fun deleteList(
|
||||
@Path("listId") listId: String
|
||||
): NetworkResult<Unit>
|
||||
suspend fun deleteList(@Path("listId") listId: String): NetworkResult<Unit>
|
||||
|
||||
@GET("api/v1/lists/{listId}/accounts")
|
||||
suspend fun getAccountsInList(
|
||||
|
|
@ -645,9 +565,7 @@ interface MastodonApi {
|
|||
): Response<List<Conversation>>
|
||||
|
||||
@DELETE("/api/v1/conversations/{id}")
|
||||
suspend fun deleteConversation(
|
||||
@Path("id") conversationId: String
|
||||
)
|
||||
suspend fun deleteConversation(@Path("id") conversationId: String)
|
||||
|
||||
@FormUrlEncoded
|
||||
@POST("api/v1/filters")
|
||||
|
|
@ -671,9 +589,7 @@ interface MastodonApi {
|
|||
): NetworkResult<FilterV1>
|
||||
|
||||
@DELETE("api/v1/filters/{id}")
|
||||
suspend fun deleteFilterV1(
|
||||
@Path("id") id: String
|
||||
): NetworkResult<ResponseBody>
|
||||
suspend fun deleteFilterV1(@Path("id") id: String): NetworkResult<ResponseBody>
|
||||
|
||||
@FormUrlEncoded
|
||||
@POST("api/v2/filters")
|
||||
|
|
@ -695,9 +611,7 @@ interface MastodonApi {
|
|||
): NetworkResult<Filter>
|
||||
|
||||
@DELETE("api/v2/filters/{id}")
|
||||
suspend fun deleteFilter(
|
||||
@Path("id") id: String
|
||||
): NetworkResult<ResponseBody>
|
||||
suspend fun deleteFilter(@Path("id") id: String): NetworkResult<ResponseBody>
|
||||
|
||||
@FormUrlEncoded
|
||||
@POST("api/v2/filters/{filterId}/keywords")
|
||||
|
|
@ -729,10 +643,7 @@ interface MastodonApi {
|
|||
|
||||
@FormUrlEncoded
|
||||
@POST("api/v1/polls/{id}/votes")
|
||||
fun voteInPollOld(
|
||||
@Path("id") id: String,
|
||||
@Field("choices[]") choices: List<Int>
|
||||
): Single<Poll>
|
||||
fun voteInPollOld(@Path("id") id: String, @Field("choices[]") choices: List<Int>): Single<Poll>
|
||||
|
||||
@GET("api/v1/announcements")
|
||||
suspend fun listAnnouncements(
|
||||
|
|
@ -740,9 +651,7 @@ interface MastodonApi {
|
|||
): NetworkResult<List<Announcement>>
|
||||
|
||||
@POST("api/v1/announcements/{id}/dismiss")
|
||||
suspend fun dismissAnnouncement(
|
||||
@Path("id") announcementId: String
|
||||
): NetworkResult<ResponseBody>
|
||||
suspend fun dismissAnnouncement(@Path("id") announcementId: String): NetworkResult<ResponseBody>
|
||||
|
||||
@PUT("api/v1/announcements/{id}/reactions/{name}")
|
||||
suspend fun addAnnouncementReaction(
|
||||
|
|
@ -776,9 +685,7 @@ interface MastodonApi {
|
|||
): Single<List<Status>>
|
||||
|
||||
@GET("api/v1/statuses/{id}")
|
||||
fun statusObservable(
|
||||
@Path("id") statusId: String
|
||||
): Single<Status>
|
||||
fun statusObservable(@Path("id") statusId: String): Single<Status>
|
||||
|
||||
@GET("api/v2/search")
|
||||
fun searchObservable(
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
* see <http://www.gnu.org/licenses>. */
|
||||
package com.keylesspalace.tusky.network
|
||||
|
||||
import java.io.IOException
|
||||
import java.io.InputStream
|
||||
import okhttp3.MediaType
|
||||
import okhttp3.RequestBody
|
||||
import okio.BufferedSink
|
||||
import java.io.IOException
|
||||
import java.io.InputStream
|
||||
|
||||
class ProgressRequestBody(private val content: InputStream, private val contentLength: Long, private val mediaType: MediaType, private val uploadListener: UploadCallback) : RequestBody() {
|
||||
fun interface UploadCallback {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue