From 2fcfff1e719c5c2e2f58d6050cf489e47d4ebd9e Mon Sep 17 00:00:00 2001
From: Javinator9889 <dev@javinator9889.com>
Date: Fri, 3 Jul 2020 11:38:01 +0200
Subject: [PATCH] Timeout in network petitions for avoiding "forever" requests

---
 app/build.gradle                                   |  2 +-
 .../views/fragments/diseases/DiseasesFragment.kt   |  4 ----
 .../handwashingreminder/network/HttpDownloader.kt  | 14 +++++++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 57a866c..3db0149 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,7 @@ android {
         applicationId "com.javinator9889.handwashingreminder"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 136
+        versionCode 137
         versionName "1.2.0-${gitCommitHash}"
         multiDexEnabled true
         resConfigs "en", "es"
diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt b/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt
index 0d8f2c8..b15d819 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt
@@ -196,9 +196,6 @@ class DiseasesFragment : BaseFragmentView(), LayoutVisibilityChange,
                         )
                     )
                 handwashingViewModel.increment(CalendarUtils.today.time)
-                Timber.d("${CalendarUtils.lastWeek.time}")
-                Timber.d("${CalendarUtils.lastMonth.time}")
-                handwashingViewModel.create(Handwashing(CalendarUtils.lastWeek.time, 12))
                 leaves.visibility = View.VISIBLE
                 if (!leaves.isAnimating)
                     leaves.playAnimation()
@@ -215,7 +212,6 @@ class DiseasesFragment : BaseFragmentView(), LayoutVisibilityChange,
                         )
                     )
                 handwashingViewModel.decrement(CalendarUtils.today.time)
-                handwashingViewModel.create(Handwashing(CalendarUtils.lastMonth.time, 123))
             }
         }
     }
diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/network/HttpDownloader.kt b/app/src/main/java/com/javinator9889/handwashingreminder/network/HttpDownloader.kt
index 664b0bd..df7561f 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/network/HttpDownloader.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/network/HttpDownloader.kt
@@ -18,16 +18,20 @@
  */
 package com.javinator9889.handwashingreminder.network
 
-import okhttp3.CacheControl
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-import okhttp3.Request
+import com.javinator9889.handwashingreminder.application.HandwashingApplication
+import okhttp3.*
 import okio.BufferedSource
 import java.io.IOException
 import java.io.Reader
+import java.util.concurrent.TimeUnit
 
 class HttpDownloader : OkHttpDownloader {
-    private val client = OkHttpClient()
+    private val client: OkHttpClient = OkHttpClient.Builder()
+        .cache(Cache(HandwashingApplication.instance.cacheDir, 2024 * 10))
+        .callTimeout(5, TimeUnit.SECONDS)
+        .readTimeout(1, TimeUnit.MINUTES)
+        .followRedirects(true)
+        .build()
 
     override fun downloadFile(url: String): BufferedSource {
         val request = with(Request.Builder()) {