Merge pull request #10 from SwevenSoftware/feature/pocFinal

close #9

Author: FrancescoPecile

app/src/main/java/com/sweven/blockcovid/MainActivity.kt

@@ -29,15 +29,12 @@ import com.sweven.blockcovid.ui.prenotazioni.PrenotazioniViewModel
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonParser
+import com.sweven.blockcovid.services.NetworkClient
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.scalars.ScalarsConverterFactory
 import java.io.File
 import java.util.*
-import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.withContext
 
 
@@ -154,17 +151,7 @@ class MainActivity : AppCompatActivity() {
             authorization = cacheFile.readText()
         }
 
-        val BASE_URL = "http://192.168.210.30:8080"
-        val TIMEOUT = 10
-        val retrofit: Retrofit?
-        val okHttpClientBuilder = OkHttpClient.Builder()
-        okHttpClientBuilder.connectTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
-
-        retrofit = Retrofit.Builder()
-                .baseUrl(BASE_URL)
-                .addConverterFactory(ScalarsConverterFactory.create())
-                .client(okHttpClientBuilder.build())
-                .build()
+        val retrofit = NetworkClient.retrofitClient
 
         val service = retrofit.create(APIReserve::class.java)
 

app/src/main/java/com/sweven/blockcovid/StartActivity.kt

@@ -17,9 +17,11 @@ class StartActivity : AppCompatActivity() {
         if(cacheFile.exists()) {
             val i = Intent(this, MainActivity::class.java)
             startActivity(i)
+            finish()
         } else {
             val i = Intent(this, LoginActivity::class.java)
             startActivity(i)
+            finish()
         }
     }
 }

app/src/main/java/com/sweven/blockcovid/data/LoginRepository.kt

@@ -2,11 +2,8 @@ package com.sweven.blockcovid.data
 
 import com.sweven.blockcovid.data.model.LoggedInUser
 import com.sweven.blockcovid.services.APIUser
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.scalars.ScalarsConverterFactory
+import com.sweven.blockcovid.services.NetworkClient
 import java.io.IOException
-import java.util.concurrent.TimeUnit
 
 /**
  * Classe che richiede l'autenticazione e le informazioni sull'utente dall'origine dati remota e
@@ -35,25 +32,14 @@ class LoginRepository(val dataSource: LoginDataSource) {
 
     suspend fun login(username: String, password: String): Result<LoggedInUser> {
 
-        val BASE_URL = "http://192.168.210.30:8080"
-        val TIMEOUT = 10
-        val retrofit: Retrofit?
-        val okHttpClientBuilder = OkHttpClient.Builder()
-        okHttpClientBuilder.connectTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
-
-        retrofit = Retrofit.Builder()
-                .baseUrl(BASE_URL)
-                .addConverterFactory(ScalarsConverterFactory.create())
-                .client(okHttpClientBuilder.build())
-                .build()
+        val retrofit = NetworkClient.retrofitClient
 
         val service = retrofit.create(APIUser::class.java)
 
         val fields: HashMap<String?, String?> = HashMap()
         fields["username"] = (username)
         fields["password"] = (password)
 
-
         val response = service.loginUser(fields)
         return if (response.isSuccessful) {
             val token = response.body()?.string().toString()

app/src/main/java/com/sweven/blockcovid/services/NetworkClient.kt

@@ -0,0 +1,27 @@
+package com.sweven.blockcovid.services
+
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.scalars.ScalarsConverterFactory
+import java.util.concurrent.TimeUnit
+
+object NetworkClient {
+
+    private const val url = "http://192.168.210.30:8080"
+    private const val timeout = 10
+    var retrofit: Retrofit? = null
+
+    val retrofitClient: Retrofit
+    get() {
+        if (retrofit == null) {
+            val okHttpClientBuilder = OkHttpClient.Builder()
+            okHttpClientBuilder.connectTimeout(timeout.toLong(), TimeUnit.SECONDS)
+            retrofit = Retrofit.Builder()
+                .baseUrl(url)
+                .addConverterFactory(ScalarsConverterFactory.create())
+                .client(okHttpClientBuilder.build())
+                .build()
+        }
+        return retrofit!!
+    }
+}