From 83cbbe9adaf6caf7ce53c9d6919552ced2b099d6 Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Tue, 19 Mar 2024 15:32:14 +0800 Subject: [PATCH] Retrofit 2.10.0 (#4330) https://github.com/square/retrofit/releases/tag/2.10.0 --- app/proguard-rules.pro | 9 --------- .../tusky/network/MastodonApi.kt | 19 +++++++++---------- .../tusky/usecase/TimelineCases.kt | 3 +-- gradle/libs.versions.toml | 2 +- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 7d4adb03e..f089e5f80 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -67,15 +67,6 @@ -keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken -keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken -# Retain generic signatures of classes used in MastodonApi so Retrofit works --keep,allowobfuscation,allowshrinking class retrofit2.Response --keep,allowobfuscation,allowshrinking class kotlin.collections.List --keep,allowobfuscation,allowshrinking class kotlin.collections.Map --keep,allowobfuscation,allowshrinking class retrofit2.Call - -# https://github.com/square/retrofit/pull/3563 --keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation - # preserve line numbers for crash reporting -keepattributes SourceFile,LineNumberTable -renamesourcefileattribute SourceFile diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt index cb4b69e00..2c462a58a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt +++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt @@ -49,7 +49,6 @@ import com.keylesspalace.tusky.entity.Translation import com.keylesspalace.tusky.entity.TrendingTag import okhttp3.MultipartBody import okhttp3.RequestBody -import okhttp3.ResponseBody import retrofit2.Call import retrofit2.Response import retrofit2.http.Body @@ -177,7 +176,7 @@ interface MastodonApi { ): Response> @POST("api/v1/notifications/clear") - suspend fun clearNotifications(): NetworkResult + suspend fun clearNotifications(): NetworkResult @FormUrlEncoded @PUT("api/v1/media/{mediaId}") @@ -273,7 +272,7 @@ interface MastodonApi { @DELETE("api/v1/scheduled_statuses/{id}") suspend fun deleteScheduledStatus( @Path("id") scheduledStatusId: String - ): NetworkResult + ): NetworkResult @GET("api/v1/accounts/verify_credentials") suspend fun accountVerifyCredentials( @@ -543,7 +542,7 @@ interface MastodonApi { ): NetworkResult @DELETE("api/v1/filters/{id}") - suspend fun deleteFilterV1(@Path("id") id: String): NetworkResult + suspend fun deleteFilterV1(@Path("id") id: String): NetworkResult @FormUrlEncoded @POST("api/v2/filters") @@ -565,7 +564,7 @@ interface MastodonApi { ): NetworkResult @DELETE("api/v2/filters/{id}") - suspend fun deleteFilter(@Path("id") id: String): NetworkResult + suspend fun deleteFilter(@Path("id") id: String): NetworkResult @FormUrlEncoded @POST("api/v2/filters/{filterId}/keywords") @@ -586,7 +585,7 @@ interface MastodonApi { @DELETE("api/v2/filters/keywords/{keywordId}") suspend fun deleteFilterKeyword( @Path("keywordId") keywordId: String - ): NetworkResult + ): NetworkResult @FormUrlEncoded @POST("api/v1/polls/{id}/votes") @@ -601,19 +600,19 @@ interface MastodonApi { ): NetworkResult> @POST("api/v1/announcements/{id}/dismiss") - suspend fun dismissAnnouncement(@Path("id") announcementId: String): NetworkResult + suspend fun dismissAnnouncement(@Path("id") announcementId: String): NetworkResult @PUT("api/v1/announcements/{id}/reactions/{name}") suspend fun addAnnouncementReaction( @Path("id") announcementId: String, @Path("name") name: String - ): NetworkResult + ): NetworkResult @DELETE("api/v1/announcements/{id}/reactions/{name}") suspend fun removeAnnouncementReaction( @Path("id") announcementId: String, @Path("name") name: String - ): NetworkResult + ): NetworkResult @FormUrlEncoded @POST("api/v1/reports") @@ -677,7 +676,7 @@ interface MastodonApi { suspend fun unsubscribePushNotifications( @Header("Authorization") auth: String, @Header(DOMAIN_HEADER) domain: String - ): NetworkResult + ): NetworkResult @GET("api/v1/tags/{name}") suspend fun tag(@Path("name") name: String): NetworkResult diff --git a/app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt b/app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt index 1cd35b573..24afc0637 100644 --- a/app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt +++ b/app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt @@ -39,7 +39,6 @@ import com.keylesspalace.tusky.util.Single import com.keylesspalace.tusky.util.getServerErrorMessage import java.util.Locale import javax.inject.Inject -import okhttp3.ResponseBody import retrofit2.Response /** @@ -182,7 +181,7 @@ class TimelineCases @Inject constructor( return Single { runCatching { mastodonApi.notifications(maxId, sinceId, limit, excludes) } } } - fun clearNotificationsOld(): Single { + fun clearNotificationsOld(): Single { return Single { mastodonApi.clearNotifications() } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c653fb883..b3b0a4447 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,7 +42,7 @@ mockito-inline = "5.2.0" mockito-kotlin = "5.2.1" networkresult-calladapter = "1.1.0" okhttp = "4.12.0" -retrofit = "2.9.0" +retrofit = "2.10.0" robolectric = "4.11.1" sparkbutton = "4.2.0" touchimageview = "3.6"