From 566de5106d148fc81a964d750eba571b11d12859 Mon Sep 17 00:00:00 2001
From: Aleksei Vinogradov <coffeewithoutlemon@gmail.com>
Date: Mon, 15 Jul 2024 23:18:49 +0700
Subject: [PATCH 1/8] =?UTF-8?q?=D0=94=D0=BE=D0=BC=D0=B0=D1=88=D0=BD=D1=8F?=
 =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   2 +
 .../main/java/otus/homework/coroutines/Cat.kt |   6 +
 .../{CatsService.kt => CatFactService.kt}     |   5 +-
 .../homework/coroutines/CatImageService.kt    |   9 ++
 .../coroutines/CatsCoroutineContext.kt        |  16 +++
 .../otus/homework/coroutines/CatsPresenter.kt |  92 ++++++++++--
 .../java/otus/homework/coroutines/CatsView.kt |  61 +++++++-
 .../otus/homework/coroutines/CatsViewModel.kt | 132 ++++++++++++++++++
 .../otus/homework/coroutines/CrashMonitor.kt  |   7 +-
 .../otus/homework/coroutines/DiContainer.kt   |  22 ++-
 .../java/otus/homework/coroutines/Fact.kt     |  10 --
 .../otus/homework/coroutines/FactResponse.kt  |  10 ++
 .../otus/homework/coroutines/ImageResponse.kt |  14 ++
 .../otus/homework/coroutines/MainActivity.kt  |  76 ++++++++--
 .../homework/coroutines/PresenterScope.kt     |  14 ++
 .../java/otus/homework/coroutines/Result.kt   |  10 ++
 .../coroutines/ServerResponseToCatUiMapper.kt |   4 +
 .../otus/homework/coroutines/Typealias.kt     |   3 +
 app/src/main/res/layout/activity_main.xml     |  30 +++-
 app/src/main/res/values/strings.xml           |   2 +
 20 files changed, 479 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/coroutines/Cat.kt
 rename app/src/main/java/otus/homework/coroutines/{CatsService.kt => CatFactService.kt} (50%)
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatImageService.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsCoroutineContext.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
 delete mode 100644 app/src/main/java/otus/homework/coroutines/Fact.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/FactResponse.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/ImageResponse.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/PresenterScope.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/Result.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/ServerResponseToCatUiMapper.kt
 create mode 100644 app/src/main/java/otus/homework/coroutines/Typealias.kt

diff --git a/app/build.gradle b/app/build.gradle
index a414e0e8..f61d978f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,4 +41,6 @@ dependencies {
     implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3'
+    implementation 'androidx.fragment:fragment-ktx:1.8.1'
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/Cat.kt b/app/src/main/java/otus/homework/coroutines/Cat.kt
new file mode 100644
index 00000000..82063859
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/Cat.kt
@@ -0,0 +1,6 @@
+package otus.homework.coroutines
+
+data class Cat(
+    val fact: String,
+    val imageUrl: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsService.kt b/app/src/main/java/otus/homework/coroutines/CatFactService.kt
similarity index 50%
rename from app/src/main/java/otus/homework/coroutines/CatsService.kt
rename to app/src/main/java/otus/homework/coroutines/CatFactService.kt
index 479b2cfb..92683341 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatFactService.kt
@@ -1,10 +1,9 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
 import retrofit2.http.GET
 
-interface CatsService {
+interface CatFactService {
 
     @GET("fact")
-    fun getCatFact() : Call<Fact>
+    suspend fun getCatFact(): FactResponse?
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatImageService.kt b/app/src/main/java/otus/homework/coroutines/CatImageService.kt
new file mode 100644
index 00000000..9cd2930d
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatImageService.kt
@@ -0,0 +1,9 @@
+package otus.homework.coroutines
+
+import retrofit2.http.GET
+
+interface CatImageService {
+
+    @GET("images/search")
+    suspend fun getCatImage(): List<ImageResponse?>?
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsCoroutineContext.kt b/app/src/main/java/otus/homework/coroutines/CatsCoroutineContext.kt
new file mode 100644
index 00000000..5a4d4611
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsCoroutineContext.kt
@@ -0,0 +1,16 @@
+package otus.homework.coroutines
+
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineName
+
+/**
+ * Вынесено отдельно, так как используется, как в презентере, так и во ViewModel
+ */
+
+fun getCatsExceptionHandler() =
+    CoroutineExceptionHandler { _, e ->
+        CrashMonitor.trackWarning(e)
+    }
+
+fun getCatsCoroutineName() =
+    CoroutineName("CatsCoroutine")
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e4b05120..e1f27ea1 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -1,28 +1,95 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeout
+import java.net.SocketTimeoutException
+
+private const val PRESENTER_CAT_JOB_KEY = "CatJob"
+private const val PRESENTER_AWAIT_TIMEOUT = 20000L
 
 class CatsPresenter(
-    private val catsService: CatsService
+    private val catFactService: CatFactService,
+    private val catImageService: CatImageService,
+    private val scope: CoroutineScope = PresenterScope(),
+    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
+    private val jobs: MutableMap<JobKey, Job> = mutableMapOf(),
+    /**
+     * Должно быть только параметром, не переменной.
+     * Локальная переменная создается дальше, чтобы ее можно было занулить
+     */
+    isDataLoadedCallbaсk: (Boolean) -> Unit
 ) {
 
     private var _catsView: ICatsView? = null
 
+    /**
+     * Локальная копия коллбэка для того,
+     * чтобы занулить ее при необходимости
+     * и минимизировать шанс утечки
+     * */
+    private var isDataLoadedCallback: ((Boolean) -> Unit)? = isDataLoadedCallbaсk
+
     fun onInitComplete() {
-        catsService.getCatFact().enqueue(object : Callback<Fact> {
+        /** Если корутина уже запущена, то ничего не делаем */
+        if (jobs.getOrDefault(PRESENTER_CAT_JOB_KEY, null)?.isActive == true) return
 
-            override fun onResponse(call: Call<Fact>, response: Response<Fact>) {
-                if (response.isSuccessful && response.body() != null) {
-                    _catsView?.populate(response.body()!!)
-                }
+        /** Добавляем Job в мапу по ключу */
+        jobs[PRESENTER_CAT_JOB_KEY] = scope.launch {
+            val factResponseDeffered = scope.async(ioDispatcher) {
+                catFactService.getCatFact()
             }
+            val imageResponseDeffered = scope.async(ioDispatcher) {
+                catImageService.getCatImage()
+            }
+
+            /** Timeout, чтобы не ждать ответа бесконечно */
+            withTimeout(PRESENTER_AWAIT_TIMEOUT) {
+                val result = try {
+                    /** Тестовое пробрасывание  SocketTimeoutException для проверки */
+//                    throw SocketTimeoutException()
+
+                    val factResponse = factResponseDeffered.await()
+                        ?: return@withTimeout
+                    val imageResponse = imageResponseDeffered.await()
+                        ?: return@withTimeout
+                    val imageResponseFirstElement = imageResponse.firstOrNull()
+                        ?: return@withTimeout
 
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                CrashMonitor.trackWarning()
+                    val cat = mapServerResponseToCat(
+                        factResponse = factResponse,
+                        imageResponse = imageResponseFirstElement
+                    )
+
+                    Result.Success<Cat>(cat)
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (e: SocketTimeoutException) {
+                    Result.Error.SocketError
+                } catch (e: Throwable) {
+                    CrashMonitor.trackWarning(e)
+                    Result.Error.OtherError(e)
+                }
+
+                /**
+                 * Логика показа Тоста внутри View,
+                 * в зависимости от результата
+                 */
+                _catsView?.populate(result)
+                isDataLoadedCallback?.invoke(true)
             }
-        })
+        }
+    }
+
+    fun cancelAllCoroutines() {
+        scope.coroutineContext.cancelChildren()
+        jobs.clear()
     }
 
     fun attachView(catsView: ICatsView) {
@@ -31,5 +98,6 @@ class CatsPresenter(
 
     fun detachView() {
         _catsView = null
+        isDataLoadedCallback = null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index be04b2a8..b5388b69 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -2,31 +2,84 @@ package otus.homework.coroutines
 
 import android.content.Context
 import android.util.AttributeSet
+import android.util.TypedValue
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.squareup.picasso.Picasso
 
+/**
+ * Считаю, что методы во вью не нужно делать suspend.
+ * Если ответ от сервера получен, то нет смысла создавать точку приостановки в данных функциях,
+ * это лишняя генерация кода под капотом в suspend функциях.
+ */
 class CatsView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
-    var presenter :CatsPresenter? = null
+    var presenter: CatsPresenter? = null
+
+    var viewModel: CatsViewModel? = null
 
     override fun onFinishInflate() {
         super.onFinishInflate()
         findViewById<Button>(R.id.button).setOnClickListener {
             presenter?.onInitComplete()
+            viewModel?.onInitComplete()
+        }
+    }
+
+    override fun populate(result: Result) {
+        when (result) {
+            is Result.Success<*> -> {
+                val cat = result.body as Cat
+                setImage(
+                    imageUrl = cat.imageUrl,
+                    imageView = findViewById<ImageView>(R.id.image)
+                )
+                findViewById<TextView>(R.id.fact_textView).text = cat.fact
+            }
+
+            Result.Error.SocketError -> {
+                val errorMessage = context.getString(R.string.no_internet_connection)
+                showToast(errorMessage)
+            }
+
+            is Result.Error.OtherError -> {
+                val errorMessage = result.e.message
+                    ?: context.getString(R.string.unknown_error)
+                showToast(errorMessage)
+            }
         }
     }
 
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.fact
+    private fun setImage(imageUrl: String, imageView: ImageView) {
+        val requiredSizeInPixels = dpToPixels(400F)
+        Picasso.get()
+            .load(imageUrl)
+            .resize(requiredSizeInPixels, requiredSizeInPixels)
+            .centerInside()
+            .into(imageView)
+    }
+
+    private fun dpToPixels(dp: Float): Int {
+        return TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            dp,
+            context.resources.displayMetrics
+        ).toInt()
+    }
+
+    private fun showToast(message: String) {
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show()
     }
 }
 
 interface ICatsView {
 
-    fun populate(fact: Fact)
+    fun populate(result: Result)
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
new file mode 100644
index 00000000..5120c8cb
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -0,0 +1,132 @@
+package otus.homework.coroutines
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeout
+import java.lang.ref.WeakReference
+import java.net.SocketTimeoutException
+import kotlin.coroutines.CoroutineContext
+
+private const val VIEW_MODEL_CAT_JOB_KEY = "CatJob"
+private const val VIEW_MODEL_AWAIT_TIMEOUT = 20000L
+
+class CatsViewModel(
+    private val catFactService: CatFactService,
+    private val catImageService: CatImageService,
+    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
+    private val jobs: MutableMap<JobKey, Job> = mutableMapOf(),
+    /**
+     * Должно быть только параметром, не переменной.
+     * Локальная переменная создается дальше, чтобы ее можно было занулить
+     */
+    isDataLoadedCallbaсk: WeakReference<(Boolean) -> Unit>
+) : ViewModel() {
+
+    private var _catsView: ICatsView? = null
+    private var isLogsEnabled = true
+
+    /**
+     * Локальная копия коллбэка для того,
+     * чтобы занулить ее при необходимости
+     * и минимизировать шанс утечки
+     * */
+    private var isDataLoadedCallback: ((Boolean) -> Unit)? = isDataLoadedCallbaсk.get()
+
+    /**
+     * Добавляю только нужное,
+     * так как у ViewModelScope и так диспетчер Main.immediate и SupervisorJob
+     */
+    private val scopeContext: CoroutineContext by lazy {
+        getCatsExceptionHandler() + getCatsCoroutineName()
+    }
+
+    fun onInitComplete() {
+        /** Если корутина уже запущена, то ничего не делаем */
+        if (jobs.getOrDefault(VIEW_MODEL_CAT_JOB_KEY, null)?.isActive == true) return
+
+        /** Добавляем Job в мапу по ключу */
+        jobs[VIEW_MODEL_CAT_JOB_KEY] = viewModelScope.launch(scopeContext) {
+            val factResponseDeffered =
+                viewModelScope.async(ioDispatcher) {
+                    catFactService.getCatFact()
+                }
+            val imageResponseDeffered =
+                viewModelScope.async(ioDispatcher) {
+                    catImageService.getCatImage()
+                }
+
+            /** Timeout, чтобы не ждать ответа бесконечно */
+            withTimeout(VIEW_MODEL_AWAIT_TIMEOUT) {
+                val result = try {
+                    /** Тестовое пробрасывание  SocketTimeoutException для проверки */
+//                    throw SocketTimeoutException()
+
+                    val factResponse = factResponseDeffered.await()
+                        ?: return@withTimeout
+                    val imageResponse = imageResponseDeffered.await()
+                        ?: return@withTimeout
+                    val imageResponseFirstElement = imageResponse.firstOrNull()
+                        ?: return@withTimeout
+
+                    val cat = mapServerResponseToCat(
+                        factResponse = factResponse,
+                        imageResponse = imageResponseFirstElement
+                    )
+
+                    Result.Success<Cat>(cat)
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (e: SocketTimeoutException) {
+                    Result.Error.SocketError
+                } catch (e: Throwable) {
+                    CrashMonitor.trackWarning(e)
+                    Result.Error.OtherError(e)
+                }
+
+                /**
+                 * Логика показа Тоста внутри View,
+                 * в зависимости от результата
+                 */
+                _catsView?.populate(result)
+                isDataLoadedCallback?.invoke(true)
+            }
+        }
+    }
+
+    fun cancelAllCoroutines() {
+        viewModelScope.coroutineContext.cancelChildren()
+        jobs.clear()
+    }
+
+    fun attachView(catsView: ICatsView) {
+        _catsView = catsView
+    }
+
+    fun detachView() {
+        _catsView = null
+        isDataLoadedCallback = null
+    }
+}
+
+class CatsViewModelFactory(
+    private val catFactService: CatFactService,
+    private val catImageService: CatImageService,
+    private val isDataLoadedCallbaсk: WeakReference<(Boolean) -> Unit>
+) :
+    ViewModelProvider.NewInstanceFactory() {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T = CatsViewModel(
+        catFactService = catFactService,
+        catImageService = catImageService,
+        isDataLoadedCallbaсk = isDataLoadedCallbaсk,
+    ) as T
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
index 32e6b018..16755dba 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -1,10 +1,15 @@
 package otus.homework.coroutines
 
+import android.util.Log
+
 object CrashMonitor {
 
+    private const val CRASH_MONITOR_TAG = "CoroutinesHomework: CrashMonitor"
+
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning() {
+    fun trackWarning(e: Throwable) {
+        Log.d(CRASH_MONITOR_TAG, "trackWarning(): $e")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
index 23ddc3b2..c9bdc37c 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -5,12 +5,28 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 class DiContainer {
 
-    private val retrofit by lazy {
+    val catFactService by lazy {
+        catFactRetrofit.create(CatFactService::class.java)
+    }
+
+    val catImageService by lazy {
+        catImageRetrofit.create(CatImageService::class.java)
+    }
+
+    private val serviceBuilder by lazy {
         Retrofit.Builder()
-            .baseUrl("https://catfact.ninja/")
             .addConverterFactory(GsonConverterFactory.create())
+    }
+
+    private val catFactRetrofit by lazy {
+        serviceBuilder
+            .baseUrl("https://catfact.ninja/")
             .build()
     }
 
-    val service by lazy { retrofit.create(CatsService::class.java) }
+    private val catImageRetrofit by lazy {
+        serviceBuilder
+            .baseUrl("https://api.thecatapi.com/v1/")
+            .build()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/Fact.kt b/app/src/main/java/otus/homework/coroutines/Fact.kt
deleted file mode 100644
index 643a5a33..00000000
--- a/app/src/main/java/otus/homework/coroutines/Fact.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package otus.homework.coroutines
-
-import com.google.gson.annotations.SerializedName
-
-data class Fact(
-	@field:SerializedName("fact")
-	val fact: String,
-	@field:SerializedName("length")
-	val length: Int
-)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/FactResponse.kt b/app/src/main/java/otus/homework/coroutines/FactResponse.kt
new file mode 100644
index 00000000..17742531
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/FactResponse.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines
+
+import com.google.gson.annotations.SerializedName
+
+data class FactResponse(
+    @field:SerializedName("fact")
+    val fact: String,
+    @field:SerializedName("length")
+    val length: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/ImageResponse.kt b/app/src/main/java/otus/homework/coroutines/ImageResponse.kt
new file mode 100644
index 00000000..9fb9602a
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/ImageResponse.kt
@@ -0,0 +1,14 @@
+package otus.homework.coroutines
+
+import com.google.gson.annotations.SerializedName
+
+data class ImageResponse(
+    @field:SerializedName("id")
+    val id: String,
+    @field:SerializedName("url")
+    val url: String,
+    @field:SerializedName("width")
+    val width: Int,
+    @field:SerializedName("height")
+    val height: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index a9dafb3b..e788044f 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -1,29 +1,89 @@
 package otus.homework.coroutines
 
-import androidx.appcompat.app.AppCompatActivity
+import android.annotation.SuppressLint
 import android.os.Bundle
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import java.lang.ref.WeakReference
 
 class MainActivity : AppCompatActivity() {
 
-    lateinit var catsPresenter: CatsPresenter
+    /** Выбрать, работать через viewModel или presenter */
+    private val isViewModel = true
 
     private val diContainer = DiContainer()
 
+    lateinit var catsPresenter: CatsPresenter
+
+    private val catsViewModel by viewModels<CatsViewModel> {
+        CatsViewModelFactory(
+            catFactService = diContainer.catFactService,
+            catImageService = diContainer.catImageService,
+            isDataLoadedCallbaсk = WeakReference(isDataLoadedCallback())
+        )
+    }
+
+    private var isDataLoaded = false
+
+    @SuppressLint("InflateParams")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsPresenter = CatsPresenter(diContainer.service)
-        view.presenter = catsPresenter
-        catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
+        if (isViewModel) {
+            view.viewModel = catsViewModel
+            catsViewModel.attachView(view)
+        } else {
+            catsPresenter = CatsPresenter(
+                catFactService = diContainer.catFactService,
+                catImageService = diContainer.catImageService,
+                isDataLoadedCallbaсk = isDataLoadedCallback()
+            )
+            view.presenter = catsPresenter
+            catsPresenter.attachView(view)
+        }
+    }
+
+    /**
+     * Перенес загрузку данных в метод onStart(),
+     * так как были кейсы блокировки экрана перед первой загрузкой.
+     * Из-за того, что корутины в onStop() останавливаются,
+     * в onStart() пользователь может увидеть пустой экран
+     */
+    override fun onStart() {
+        super.onStart()
+        if (!isDataLoaded) {
+            if (isViewModel) {
+                catsViewModel.onInitComplete()
+            } else {
+                catsPresenter.onInitComplete()
+            }
+        }
+    }
+
+    /**
+     * Колбек для того,чтобы установить флаг idDataLoaded на true
+     * в корутине загрузки данных.
+     * Установить его в onStart() не получится, так как корутина может оборваться,
+     * а флаг будет все равно установлен
+     */
+    private fun isDataLoadedCallback(): (Boolean) -> Unit = { isLoaded: Boolean ->
+        isDataLoaded = isLoaded
     }
 
     override fun onStop() {
-        if (isFinishing) {
-            catsPresenter.detachView()
+        if (isViewModel) {
+            catsViewModel.cancelAllCoroutines()
+            if (isFinishing) {
+                catsViewModel.detachView()
+            }
+        } else {
+            catsPresenter.cancelAllCoroutines()
+            if (isFinishing) {
+                catsPresenter.detachView()
+            }
         }
         super.onStop()
     }
diff --git a/app/src/main/java/otus/homework/coroutines/PresenterScope.kt b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
new file mode 100644
index 00000000..972b2830
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
@@ -0,0 +1,14 @@
+package otus.homework.coroutines
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlin.coroutines.CoroutineContext
+
+class PresenterScope : CoroutineScope {
+    override val coroutineContext: CoroutineContext
+        get() = Dispatchers.Main.immediate +
+                getCatsCoroutineName() +
+                getCatsExceptionHandler() +
+                SupervisorJob()
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/Result.kt b/app/src/main/java/otus/homework/coroutines/Result.kt
new file mode 100644
index 00000000..6adba64b
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/Result.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines
+
+sealed class Result {
+    data class Success<T>(val body: T) : Result()
+
+    sealed class Error : Result() {
+        object SocketError : Error()
+        data class OtherError(val e: Throwable) : Error()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/ServerResponseToCatUiMapper.kt b/app/src/main/java/otus/homework/coroutines/ServerResponseToCatUiMapper.kt
new file mode 100644
index 00000000..4526e607
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/ServerResponseToCatUiMapper.kt
@@ -0,0 +1,4 @@
+package otus.homework.coroutines
+
+fun mapServerResponseToCat(factResponse: FactResponse, imageResponse: ImageResponse) =
+    Cat(fact = factResponse.fact, imageUrl = imageResponse.url)
diff --git a/app/src/main/java/otus/homework/coroutines/Typealias.kt b/app/src/main/java/otus/homework/coroutines/Typealias.kt
new file mode 100644
index 00000000..342b3ba5
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/Typealias.kt
@@ -0,0 +1,3 @@
+package otus.homework.coroutines
+
+typealias JobKey = String
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..935b02be 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,28 +3,48 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:padding="16dp"
     android:layout_height="match_parent"
+    android:padding="16dp"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toTopOf="@id/fact_textView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:layout_height="200dp"
+        tools:layout_width="200dp" />
+
     <TextView
         android:id="@+id/fact_textView"
-        android:textColor="@color/black"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="10"
+        android:textColor="@color/black"
+        android:textSize="24sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, Коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, Коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, Коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, Коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, Коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, Коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты, коты" />
 
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
         android:text="@string/more_facts"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
+        app:layout_constraintTop_toBottomOf="@id/fact_textView"
+        app:layout_constraintVertical_bias="0" />
 
 </otus.homework.coroutines.CatsView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6c270d5d..399e6487 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <resources>
     <string name="app_name">Cat Facts </string>
     <string name="more_facts">More Facts</string>
+    <string name="no_internet_connection">Не удалось получить ответ от сервера</string>
+    <string name="unknown_error">Неизвестная ошибка</string>
 </resources>
\ No newline at end of file

From 63c00e4519cab639f051176eef769685aa933431 Mon Sep 17 00:00:00 2001
From: Aleksei Vinogradov <coffeewithoutlemon@gmail.com>
Date: Tue, 16 Jul 2024 00:13:12 +0700
Subject: [PATCH 2/8] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BB?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/otus/homework/coroutines/CatsPresenter.kt     | 10 ++++++++--
 .../java/otus/homework/coroutines/CatsViewModel.kt     | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index e1f27ea1..503b55b4 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -21,6 +21,12 @@ class CatsPresenter(
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private val jobs: MutableMap<JobKey, Job> = mutableMapOf(),
     /**
+     * Колбэк для установки флага через корутину, что данные загружены.
+     * Если флаг == true, то данные больше не будут загружаться в onStart().
+     * Флаг нужен, чтобы, если приложение ушло в onStop() до загрузки данных,
+     * (флаг == false), а корутины отменились,
+     * то приложение в onStart() попыталось загрузить данные еще раз,
+     * а пользователь не остался с пустым экраном.
      * Должно быть только параметром, не переменной.
      * Локальная переменная создается дальше, чтобы ее можно было занулить
      */
@@ -78,8 +84,8 @@ class CatsPresenter(
                 }
 
                 /**
-                 * Логика показа Тоста внутри View,
-                 * в зависимости от результата
+                 * Логика показа Тоста находится внутри View,
+                 * работает в зависимости от результата
                  */
                 _catsView?.populate(result)
                 isDataLoadedCallback?.invoke(true)
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index 5120c8cb..df8d4a91 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -24,6 +24,12 @@ class CatsViewModel(
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private val jobs: MutableMap<JobKey, Job> = mutableMapOf(),
     /**
+     * Колбэк для установки флага через корутину, что данные загружены.
+     * Если флаг == true, то данные больше не будут загружаться в onStart().
+     * Флаг нужен, чтобы, если приложение ушло в onStop() до загрузки данных,
+     * (флаг == false), а корутины отменились,
+     * то приложение в onStart() попыталось загрузить данные еще раз,
+     * а пользователь не остался с пустым экраном.
      * Должно быть только параметром, не переменной.
      * Локальная переменная создается дальше, чтобы ее можно было занулить
      */
@@ -92,8 +98,8 @@ class CatsViewModel(
                 }
 
                 /**
-                 * Логика показа Тоста внутри View,
-                 * в зависимости от результата
+                 * Логика показа Тоста находится внутри View,
+                 * работает в зависимости от результата
                  */
                 _catsView?.populate(result)
                 isDataLoadedCallback?.invoke(true)

From da38a2a95b084a41b9f9a65e6d757ce0a9dea84e Mon Sep 17 00:00:00 2001
From: Aleksei Vinogradov <coffeewithoutlemon@gmail.com>
Date: Thu, 25 Jul 2024 23:59:31 +0700
Subject: [PATCH 3/8] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20nullable?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=8B=20=D1=81=20=D1=81=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/otus/homework/coroutines/CatFactService.kt  | 2 +-
 app/src/main/java/otus/homework/coroutines/CatImageService.kt | 2 +-
 app/src/main/java/otus/homework/coroutines/CatsPresenter.kt   | 2 --
 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt   | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatFactService.kt b/app/src/main/java/otus/homework/coroutines/CatFactService.kt
index 92683341..617b198f 100644
--- a/app/src/main/java/otus/homework/coroutines/CatFactService.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatFactService.kt
@@ -5,5 +5,5 @@ import retrofit2.http.GET
 interface CatFactService {
 
     @GET("fact")
-    suspend fun getCatFact(): FactResponse?
+    suspend fun getCatFact(): FactResponse
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatImageService.kt b/app/src/main/java/otus/homework/coroutines/CatImageService.kt
index 9cd2930d..3d1b8278 100644
--- a/app/src/main/java/otus/homework/coroutines/CatImageService.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatImageService.kt
@@ -5,5 +5,5 @@ import retrofit2.http.GET
 interface CatImageService {
 
     @GET("images/search")
-    suspend fun getCatImage(): List<ImageResponse?>?
+    suspend fun getCatImage(): List<ImageResponse>
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 503b55b4..88692c9e 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -62,9 +62,7 @@ class CatsPresenter(
 //                    throw SocketTimeoutException()
 
                     val factResponse = factResponseDeffered.await()
-                        ?: return@withTimeout
                     val imageResponse = imageResponseDeffered.await()
-                        ?: return@withTimeout
                     val imageResponseFirstElement = imageResponse.firstOrNull()
                         ?: return@withTimeout
 
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index df8d4a91..acc84b51 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -76,9 +76,7 @@ class CatsViewModel(
 //                    throw SocketTimeoutException()
 
                     val factResponse = factResponseDeffered.await()
-                        ?: return@withTimeout
                     val imageResponse = imageResponseDeffered.await()
-                        ?: return@withTimeout
                     val imageResponseFirstElement = imageResponse.firstOrNull()
                         ?: return@withTimeout
 

From d68766557b0203afa5a5bddead887f0d740937dd Mon Sep 17 00:00:00 2001
From: Aleksei Vinogradov <coffeewithoutlemon@gmail.com>
Date: Fri, 26 Jul 2024 00:26:52 +0700
Subject: [PATCH 4/8] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BB=D0=B1=D1=8D=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otus/homework/coroutines/CatsPresenter.kt | 22 ++--------------
 .../otus/homework/coroutines/CatsViewModel.kt | 25 +++----------------
 .../otus/homework/coroutines/MainActivity.kt  |  3 +--
 3 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 88692c9e..3c72a89b 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -20,28 +20,11 @@ class CatsPresenter(
     private val scope: CoroutineScope = PresenterScope(),
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private val jobs: MutableMap<JobKey, Job> = mutableMapOf(),
-    /**
-     * Колбэк для установки флага через корутину, что данные загружены.
-     * Если флаг == true, то данные больше не будут загружаться в onStart().
-     * Флаг нужен, чтобы, если приложение ушло в onStop() до загрузки данных,
-     * (флаг == false), а корутины отменились,
-     * то приложение в onStart() попыталось загрузить данные еще раз,
-     * а пользователь не остался с пустым экраном.
-     * Должно быть только параметром, не переменной.
-     * Локальная переменная создается дальше, чтобы ее можно было занулить
-     */
-    isDataLoadedCallbaсk: (Boolean) -> Unit
+    private val isDataLoadedCallbaсk: (Boolean) -> Unit
 ) {
 
     private var _catsView: ICatsView? = null
 
-    /**
-     * Локальная копия коллбэка для того,
-     * чтобы занулить ее при необходимости
-     * и минимизировать шанс утечки
-     * */
-    private var isDataLoadedCallback: ((Boolean) -> Unit)? = isDataLoadedCallbaсk
-
     fun onInitComplete() {
         /** Если корутина уже запущена, то ничего не делаем */
         if (jobs.getOrDefault(PRESENTER_CAT_JOB_KEY, null)?.isActive == true) return
@@ -86,7 +69,7 @@ class CatsPresenter(
                  * работает в зависимости от результата
                  */
                 _catsView?.populate(result)
-                isDataLoadedCallback?.invoke(true)
+                isDataLoadedCallbaсk(true)
             }
         }
     }
@@ -102,6 +85,5 @@ class CatsPresenter(
 
     fun detachView() {
         _catsView = null
-        isDataLoadedCallback = null
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index acc84b51..37214e66 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -11,7 +11,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
-import java.lang.ref.WeakReference
 import java.net.SocketTimeoutException
 import kotlin.coroutines.CoroutineContext
 
@@ -23,29 +22,12 @@ class CatsViewModel(
     private val catImageService: CatImageService,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private val jobs: MutableMap<JobKey, Job> = mutableMapOf(),
-    /**
-     * Колбэк для установки флага через корутину, что данные загружены.
-     * Если флаг == true, то данные больше не будут загружаться в onStart().
-     * Флаг нужен, чтобы, если приложение ушло в onStop() до загрузки данных,
-     * (флаг == false), а корутины отменились,
-     * то приложение в onStart() попыталось загрузить данные еще раз,
-     * а пользователь не остался с пустым экраном.
-     * Должно быть только параметром, не переменной.
-     * Локальная переменная создается дальше, чтобы ее можно было занулить
-     */
-    isDataLoadedCallbaсk: WeakReference<(Boolean) -> Unit>
+    private val isDataLoadedCallbaсk: (Boolean) -> Unit
 ) : ViewModel() {
 
     private var _catsView: ICatsView? = null
     private var isLogsEnabled = true
 
-    /**
-     * Локальная копия коллбэка для того,
-     * чтобы занулить ее при необходимости
-     * и минимизировать шанс утечки
-     * */
-    private var isDataLoadedCallback: ((Boolean) -> Unit)? = isDataLoadedCallbaсk.get()
-
     /**
      * Добавляю только нужное,
      * так как у ViewModelScope и так диспетчер Main.immediate и SupervisorJob
@@ -100,7 +82,7 @@ class CatsViewModel(
                  * работает в зависимости от результата
                  */
                 _catsView?.populate(result)
-                isDataLoadedCallback?.invoke(true)
+                isDataLoadedCallbaсk(true)
             }
         }
     }
@@ -116,14 +98,13 @@ class CatsViewModel(
 
     fun detachView() {
         _catsView = null
-        isDataLoadedCallback = null
     }
 }
 
 class CatsViewModelFactory(
     private val catFactService: CatFactService,
     private val catImageService: CatImageService,
-    private val isDataLoadedCallbaсk: WeakReference<(Boolean) -> Unit>
+    private val isDataLoadedCallbaсk: (Boolean) -> Unit
 ) :
     ViewModelProvider.NewInstanceFactory() {
 
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index e788044f..5404210d 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import java.lang.ref.WeakReference
 
 class MainActivity : AppCompatActivity() {
 
@@ -19,7 +18,7 @@ class MainActivity : AppCompatActivity() {
         CatsViewModelFactory(
             catFactService = diContainer.catFactService,
             catImageService = diContainer.catImageService,
-            isDataLoadedCallbaсk = WeakReference(isDataLoadedCallback())
+            isDataLoadedCallbaсk = isDataLoadedCallback()
         )
     }
 

From 36881ec98dd2d96da29cb5f55ec655c8b731152d Mon Sep 17 00:00:00 2001
From: Aleksei Vinogradov <coffeewithoutlemon@gmail.com>
Date: Fri, 26 Jul 2024 00:32:18 +0700
Subject: [PATCH 5/8] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D1=83=20=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=B8=D0=B2=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20job=20=D0=B8=20Map?=
 =?UTF-8?q?'=D1=8B=20c=20job?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/otus/homework/coroutines/CatsPresenter.kt     |  9 +--------
 .../java/otus/homework/coroutines/CatsViewModel.kt     | 10 +---------
 .../main/java/otus/homework/coroutines/Typealias.kt    |  3 ---
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 app/src/main/java/otus/homework/coroutines/Typealias.kt

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 3c72a89b..cb1bc450 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -4,7 +4,6 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
@@ -19,18 +18,13 @@ class CatsPresenter(
     private val catImageService: CatImageService,
     private val scope: CoroutineScope = PresenterScope(),
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
-    private val jobs: MutableMap<JobKey, Job> = mutableMapOf(),
     private val isDataLoadedCallbaсk: (Boolean) -> Unit
 ) {
 
     private var _catsView: ICatsView? = null
 
     fun onInitComplete() {
-        /** Если корутина уже запущена, то ничего не делаем */
-        if (jobs.getOrDefault(PRESENTER_CAT_JOB_KEY, null)?.isActive == true) return
-
-        /** Добавляем Job в мапу по ключу */
-        jobs[PRESENTER_CAT_JOB_KEY] = scope.launch {
+        scope.launch {
             val factResponseDeffered = scope.async(ioDispatcher) {
                 catFactService.getCatFact()
             }
@@ -76,7 +70,6 @@ class CatsPresenter(
 
     fun cancelAllCoroutines() {
         scope.coroutineContext.cancelChildren()
-        jobs.clear()
     }
 
     fun attachView(catsView: ICatsView) {
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index 37214e66..4af61a24 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -6,7 +6,6 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
@@ -14,14 +13,12 @@ import kotlinx.coroutines.withTimeout
 import java.net.SocketTimeoutException
 import kotlin.coroutines.CoroutineContext
 
-private const val VIEW_MODEL_CAT_JOB_KEY = "CatJob"
 private const val VIEW_MODEL_AWAIT_TIMEOUT = 20000L
 
 class CatsViewModel(
     private val catFactService: CatFactService,
     private val catImageService: CatImageService,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
-    private val jobs: MutableMap<JobKey, Job> = mutableMapOf(),
     private val isDataLoadedCallbaсk: (Boolean) -> Unit
 ) : ViewModel() {
 
@@ -37,11 +34,7 @@ class CatsViewModel(
     }
 
     fun onInitComplete() {
-        /** Если корутина уже запущена, то ничего не делаем */
-        if (jobs.getOrDefault(VIEW_MODEL_CAT_JOB_KEY, null)?.isActive == true) return
-
-        /** Добавляем Job в мапу по ключу */
-        jobs[VIEW_MODEL_CAT_JOB_KEY] = viewModelScope.launch(scopeContext) {
+        viewModelScope.launch(scopeContext) {
             val factResponseDeffered =
                 viewModelScope.async(ioDispatcher) {
                     catFactService.getCatFact()
@@ -89,7 +82,6 @@ class CatsViewModel(
 
     fun cancelAllCoroutines() {
         viewModelScope.coroutineContext.cancelChildren()
-        jobs.clear()
     }
 
     fun attachView(catsView: ICatsView) {
diff --git a/app/src/main/java/otus/homework/coroutines/Typealias.kt b/app/src/main/java/otus/homework/coroutines/Typealias.kt
deleted file mode 100644
index 342b3ba5..00000000
--- a/app/src/main/java/otus/homework/coroutines/Typealias.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package otus.homework.coroutines
-
-typealias JobKey = String
\ No newline at end of file

From 4356121f7360467c836bcfa88f4332e45695475e Mon Sep 17 00:00:00 2001
From: Aleksei Vinogradov <coffeewithoutlemon@gmail.com>
Date: Fri, 26 Jul 2024 01:04:28 +0700
Subject: [PATCH 6/8] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20withTimeou?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otus/homework/coroutines/CatsPresenter.kt | 55 ++++++++---------
 .../otus/homework/coroutines/CatsViewModel.kt | 60 +++++++++----------
 2 files changed, 52 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index cb1bc450..782f4f83 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -7,11 +7,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeout
 import java.net.SocketTimeoutException
 
 private const val PRESENTER_CAT_JOB_KEY = "CatJob"
-private const val PRESENTER_AWAIT_TIMEOUT = 20000L
 
 class CatsPresenter(
     private val catFactService: CatFactService,
@@ -32,39 +30,36 @@ class CatsPresenter(
                 catImageService.getCatImage()
             }
 
-            /** Timeout, чтобы не ждать ответа бесконечно */
-            withTimeout(PRESENTER_AWAIT_TIMEOUT) {
-                val result = try {
-                    /** Тестовое пробрасывание  SocketTimeoutException для проверки */
+            val result = try {
+                /** Тестовое пробрасывание  SocketTimeoutException для проверки */
 //                    throw SocketTimeoutException()
 
-                    val factResponse = factResponseDeffered.await()
-                    val imageResponse = imageResponseDeffered.await()
-                    val imageResponseFirstElement = imageResponse.firstOrNull()
-                        ?: return@withTimeout
+                val factResponse = factResponseDeffered.await()
+                val imageResponse = imageResponseDeffered.await()
+                val imageResponseFirstElement = imageResponse.firstOrNull()
+                    ?: return@launch
 
-                    val cat = mapServerResponseToCat(
-                        factResponse = factResponse,
-                        imageResponse = imageResponseFirstElement
-                    )
+                val cat = mapServerResponseToCat(
+                    factResponse = factResponse,
+                    imageResponse = imageResponseFirstElement
+                )
 
-                    Result.Success<Cat>(cat)
-                } catch (e: CancellationException) {
-                    throw e
-                } catch (e: SocketTimeoutException) {
-                    Result.Error.SocketError
-                } catch (e: Throwable) {
-                    CrashMonitor.trackWarning(e)
-                    Result.Error.OtherError(e)
-                }
-
-                /**
-                 * Логика показа Тоста находится внутри View,
-                 * работает в зависимости от результата
-                 */
-                _catsView?.populate(result)
-                isDataLoadedCallbaсk(true)
+                Result.Success<Cat>(cat)
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: SocketTimeoutException) {
+                Result.Error.SocketError
+            } catch (e: Throwable) {
+                CrashMonitor.trackWarning(e)
+                Result.Error.OtherError(e)
             }
+
+            /**
+             * Логика показа Тоста находится внутри View,
+             * работает в зависимости от результата
+             */
+            _catsView?.populate(result)
+            isDataLoadedCallbaсk(true)
         }
     }
 
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index 4af61a24..488360a9 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -9,12 +9,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeout
 import java.net.SocketTimeoutException
 import kotlin.coroutines.CoroutineContext
 
-private const val VIEW_MODEL_AWAIT_TIMEOUT = 20000L
-
 class CatsViewModel(
     private val catFactService: CatFactService,
     private val catImageService: CatImageService,
@@ -44,39 +41,36 @@ class CatsViewModel(
                     catImageService.getCatImage()
                 }
 
-            /** Timeout, чтобы не ждать ответа бесконечно */
-            withTimeout(VIEW_MODEL_AWAIT_TIMEOUT) {
-                val result = try {
-                    /** Тестовое пробрасывание  SocketTimeoutException для проверки */
+            val result = try {
+                /** Тестовое пробрасывание  SocketTimeoutException для проверки */
 //                    throw SocketTimeoutException()
 
-                    val factResponse = factResponseDeffered.await()
-                    val imageResponse = imageResponseDeffered.await()
-                    val imageResponseFirstElement = imageResponse.firstOrNull()
-                        ?: return@withTimeout
-
-                    val cat = mapServerResponseToCat(
-                        factResponse = factResponse,
-                        imageResponse = imageResponseFirstElement
-                    )
-
-                    Result.Success<Cat>(cat)
-                } catch (e: CancellationException) {
-                    throw e
-                } catch (e: SocketTimeoutException) {
-                    Result.Error.SocketError
-                } catch (e: Throwable) {
-                    CrashMonitor.trackWarning(e)
-                    Result.Error.OtherError(e)
-                }
-
-                /**
-                 * Логика показа Тоста находится внутри View,
-                 * работает в зависимости от результата
-                 */
-                _catsView?.populate(result)
-                isDataLoadedCallbaсk(true)
+                val factResponse = factResponseDeffered.await()
+                val imageResponse = imageResponseDeffered.await()
+                val imageResponseFirstElement = imageResponse.firstOrNull()
+                    ?: return@launch
+
+                val cat = mapServerResponseToCat(
+                    factResponse = factResponse,
+                    imageResponse = imageResponseFirstElement
+                )
+
+                Result.Success<Cat>(cat)
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: SocketTimeoutException) {
+                Result.Error.SocketError
+            } catch (e: Throwable) {
+                CrashMonitor.trackWarning(e)
+                Result.Error.OtherError(e)
             }
+
+            /**
+             * Логика показа Тоста находится внутри View,
+             * работает в зависимости от результата
+             */
+            _catsView?.populate(result)
+            isDataLoadedCallbaсk(true)
         }
     }
 

From 357c3d326ca62cc06d44421d65e97bde82a33e0e Mon Sep 17 00:00:00 2001
From: Aleksei Vinogradov <coffeewithoutlemon@gmail.com>
Date: Fri, 26 Jul 2024 01:11:42 +0700
Subject: [PATCH 7/8] =?UTF-8?q?=D0=92=D1=8B=D0=BD=D0=B5=D1=81=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=83=D1=8E=20scopeC?=
 =?UTF-8?q?ontext=20=D0=B2=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E-?=
 =?UTF-8?q?=D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B5=D0=B5=20=D0=B2=20?=
 =?UTF-8?q?PresenterScope?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otus/homework/coroutines/CatsCoroutineContext.kt  |  3 +++
 .../java/otus/homework/coroutines/CatsViewModel.kt    | 11 +----------
 .../java/otus/homework/coroutines/PresenterScope.kt   |  5 ++---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsCoroutineContext.kt b/app/src/main/java/otus/homework/coroutines/CatsCoroutineContext.kt
index 5a4d4611..0a33c07e 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsCoroutineContext.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsCoroutineContext.kt
@@ -2,11 +2,14 @@ package otus.homework.coroutines
 
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineName
+import kotlin.coroutines.CoroutineContext
 
 /**
  * Вынесено отдельно, так как используется, как в презентере, так и во ViewModel
  */
 
+fun getCoroutineContext(): CoroutineContext = getCatsExceptionHandler() + getCatsCoroutineName()
+
 fun getCatsExceptionHandler() =
     CoroutineExceptionHandler { _, e ->
         CrashMonitor.trackWarning(e)
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index 488360a9..f01a91ec 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -10,7 +10,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
-import kotlin.coroutines.CoroutineContext
 
 class CatsViewModel(
     private val catFactService: CatFactService,
@@ -22,16 +21,8 @@ class CatsViewModel(
     private var _catsView: ICatsView? = null
     private var isLogsEnabled = true
 
-    /**
-     * Добавляю только нужное,
-     * так как у ViewModelScope и так диспетчер Main.immediate и SupervisorJob
-     */
-    private val scopeContext: CoroutineContext by lazy {
-        getCatsExceptionHandler() + getCatsCoroutineName()
-    }
-
     fun onInitComplete() {
-        viewModelScope.launch(scopeContext) {
+        viewModelScope.launch(getCoroutineContext()) {
             val factResponseDeffered =
                 viewModelScope.async(ioDispatcher) {
                     catFactService.getCatFact()
diff --git a/app/src/main/java/otus/homework/coroutines/PresenterScope.kt b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
index 972b2830..dbab1054 100644
--- a/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
+++ b/app/src/main/java/otus/homework/coroutines/PresenterScope.kt
@@ -7,8 +7,7 @@ import kotlin.coroutines.CoroutineContext
 
 class PresenterScope : CoroutineScope {
     override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main.immediate +
-                getCatsCoroutineName() +
-                getCatsExceptionHandler() +
+        get() = getCoroutineContext() +
+                Dispatchers.Main.immediate +
                 SupervisorJob()
 }
\ No newline at end of file

From e827ea05fc0a13ba588e33c80e03daa3da4b246f Mon Sep 17 00:00:00 2001
From: Aleksei Vinogradov <coffeewithoutlemon@gmail.com>
Date: Fri, 26 Jul 2024 01:14:25 +0700
Subject: [PATCH 8/8] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D0=BE=D1=87=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BA=D0=BE=D1=80=D1=83=D1=82=D0=B8=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/otus/homework/coroutines/CatsPresenter.kt | 5 -----
 app/src/main/java/otus/homework/coroutines/CatsViewModel.kt | 5 -----
 app/src/main/java/otus/homework/coroutines/MainActivity.kt  | 2 --
 3 files changed, 12 deletions(-)

diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
index 782f4f83..9014e5bc 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
@@ -5,7 +5,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
-import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 
@@ -63,10 +62,6 @@ class CatsPresenter(
         }
     }
 
-    fun cancelAllCoroutines() {
-        scope.coroutineContext.cancelChildren()
-    }
-
     fun attachView(catsView: ICatsView) {
         _catsView = catsView
     }
diff --git a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
index f01a91ec..51896fd3 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsViewModel.kt
@@ -7,7 +7,6 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
-import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
 import java.net.SocketTimeoutException
 
@@ -65,10 +64,6 @@ class CatsViewModel(
         }
     }
 
-    fun cancelAllCoroutines() {
-        viewModelScope.coroutineContext.cancelChildren()
-    }
-
     fun attachView(catsView: ICatsView) {
         _catsView = catsView
     }
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index 5404210d..841b0352 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -74,12 +74,10 @@ class MainActivity : AppCompatActivity() {
 
     override fun onStop() {
         if (isViewModel) {
-            catsViewModel.cancelAllCoroutines()
             if (isFinishing) {
                 catsViewModel.detachView()
             }
         } else {
-            catsPresenter.cancelAllCoroutines()
             if (isFinishing) {
                 catsPresenter.detachView()
             }