diff --git a/app/src/main/java/app/pachli/components/compose/MediaUploader.kt b/app/src/main/java/app/pachli/components/compose/MediaUploader.kt index 1d08014e5..256d5d566 100644 --- a/app/src/main/java/app/pachli/components/compose/MediaUploader.kt +++ b/app/src/main/java/app/pachli/components/compose/MediaUploader.kt @@ -31,8 +31,8 @@ import app.pachli.R import app.pachli.components.compose.ComposeActivity.QueuedMedia import app.pachli.core.common.string.randomAlphanumericString import app.pachli.core.data.model.InstanceInfo -import app.pachli.core.mastodon.model.MediaUploadApi import app.pachli.core.network.extensions.getServerErrorMessage +import app.pachli.core.network.model.MediaUploadApi import app.pachli.network.ProgressRequestBody import app.pachli.util.MEDIA_SIZE_UNKNOWN import app.pachli.util.getImageSquarePixels diff --git a/core/network-test/src/main/kotlin/app/pachli/core/network/di/test/FakeNetworkModule.kt b/core/network-test/src/main/kotlin/app/pachli/core/network/di/test/FakeNetworkModule.kt index 380c635c5..44a119e45 100644 --- a/core/network-test/src/main/kotlin/app/pachli/core/network/di/test/FakeNetworkModule.kt +++ b/core/network-test/src/main/kotlin/app/pachli/core/network/di/test/FakeNetworkModule.kt @@ -17,9 +17,9 @@ package app.pachli.core.network.di.test -import app.pachli.core.mastodon.model.MediaUploadApi import app.pachli.core.network.di.NetworkModule import app.pachli.core.network.json.Guarded +import app.pachli.core.network.model.MediaUploadApi import com.squareup.moshi.Moshi import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter import dagger.Module diff --git a/core/network/src/main/kotlin/app/pachli/core/network/di/NetworkModule.kt b/core/network/src/main/kotlin/app/pachli/core/network/di/NetworkModule.kt index 2164610e6..a2f944ed7 100644 --- a/core/network/src/main/kotlin/app/pachli/core/network/di/NetworkModule.kt +++ b/core/network/src/main/kotlin/app/pachli/core/network/di/NetworkModule.kt @@ -20,13 +20,13 @@ package app.pachli.core.network.di import android.content.Context import android.os.Build import app.pachli.core.common.util.versionName -import app.pachli.core.mastodon.model.MediaUploadApi import app.pachli.core.network.BuildConfig import app.pachli.core.network.json.BooleanIfNull import app.pachli.core.network.json.DefaultIfNull import app.pachli.core.network.json.EnumConstantConverterFactory import app.pachli.core.network.json.Guarded import app.pachli.core.network.json.HasDefault +import app.pachli.core.network.model.MediaUploadApi import app.pachli.core.network.retrofit.InstanceSwitchAuthInterceptor import app.pachli.core.network.retrofit.MastodonApi import app.pachli.core.network.retrofit.apiresult.ApiResultCallAdapterFactory diff --git a/core/network/src/main/kotlin/app/pachli/core/network/model/MediaUploadApi.kt b/core/network/src/main/kotlin/app/pachli/core/network/model/MediaUploadApi.kt index ed9a06786..6acba676a 100644 --- a/core/network/src/main/kotlin/app/pachli/core/network/model/MediaUploadApi.kt +++ b/core/network/src/main/kotlin/app/pachli/core/network/model/MediaUploadApi.kt @@ -15,9 +15,8 @@ * see . */ -package app.pachli.core.mastodon.model +package app.pachli.core.network.model -import app.pachli.core.network.model.MediaUploadResult import okhttp3.MultipartBody import retrofit2.Response import retrofit2.http.Multipart