From 5d2722b2205e404ee90cbb7e141ac63ca6570e1a Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Fri, 4 Jan 2019 23:59:30 -0500
Subject: Remove unused dependencies and remove reactivex from username fetcher

---
 .../com/pitchedapps/frost/dbflow/CookiesDb.kt      | 28 +++++++-----------
 .../frost/facebook/requests/FbRequestTest.kt       |  2 +-
 .../com/pitchedapps/frost/internal/Internal.kt     | 34 ----------------------
 3 files changed, 12 insertions(+), 52 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
index f7d97833..d7dd71ed 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
@@ -17,7 +17,7 @@
 package com.pitchedapps.frost.dbflow
 
 import android.os.Parcelable
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.pitchedapps.frost.dbflow.CookieModel_Table.cookie
 import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.frostJsoup
@@ -34,11 +34,10 @@ import com.raizlabs.android.dbflow.kotlinextensions.save
 import com.raizlabs.android.dbflow.kotlinextensions.select
 import com.raizlabs.android.dbflow.kotlinextensions.where
 import com.raizlabs.android.dbflow.structure.BaseModel
-import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
 import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
 import java.net.UnknownHostException
 
 /**
@@ -98,25 +97,20 @@ fun removeCookie(id: Long) {
     }
 }
 
-inline fun CookieModel.fetchUsername(crossinline callback: (String) -> Unit): Disposable =
-    ReactiveNetwork.checkInternetConnectivity().subscribeOn(Schedulers.io()).subscribe { yes, _ ->
-        if (!yes) return@subscribe callback("")
-        var result = ""
+suspend fun CookieModel.fetchUsername(): String? = withContext(Dispatchers.IO) {
+    withTimeoutOrNull(5000) {
+        var result: String? = null
         try {
             result = frostJsoup(cookie, FbItem.PROFILE.url).title()
             L.d { "Fetch username found" }
         } catch (e: Exception) {
             if (e !is UnknownHostException)
                 e.logFrostEvent("Fetch username failed")
-        } finally {
-            if (result.isBlank() && (name?.isNotBlank() == true)) {
-                callback(name!!)
-                return@subscribe
-            }
-            if (name != result) {
-                name = result
-                saveFbCookie(this@fetchUsername)
-            }
-            callback(result)
         }
+        if (name?.isNotBlank() == false && result != null && result != name) {
+            name = result
+            saveFbCookie(this@fetchUsername)
+        }
+        result
     }
+}
\ No newline at end of file
diff --git a/app/src/test/kotlin/com/pitchedapps/frost/facebook/requests/FbRequestTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/facebook/requests/FbRequestTest.kt
index ec765448..8610436a 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/facebook/requests/FbRequestTest.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/facebook/requests/FbRequestTest.kt
@@ -84,7 +84,7 @@ class FbRequestTest {
         val data = AUTH.getMenuData().invoke()
         assertNotNull(data)
         println(ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(data))
-        assertTrue(data!!.data.isNotEmpty())
+        assertTrue(data.data.isNotEmpty())
         assertTrue(data.footer.hasContent, "Footer may be badly parsed")
         val items = data.flatMapValid()
         assertTrue(items.size > 15, "Something may be badly parsed")
diff --git a/app/src/test/kotlin/com/pitchedapps/frost/internal/Internal.kt b/app/src/test/kotlin/com/pitchedapps/frost/internal/Internal.kt
index 061e7c38..b8d9635a 100644
--- a/app/src/test/kotlin/com/pitchedapps/frost/internal/Internal.kt
+++ b/app/src/test/kotlin/com/pitchedapps/frost/internal/Internal.kt
@@ -22,13 +22,10 @@ import com.pitchedapps.frost.facebook.get
 import com.pitchedapps.frost.facebook.requests.RequestAuth
 import com.pitchedapps.frost.facebook.requests.getAuth
 import com.pitchedapps.frost.utils.frostJsoup
-import io.reactivex.Completable
 import org.junit.Assume
-import org.junit.Test
 import java.io.File
 import java.io.FileInputStream
 import java.util.Properties
-import java.util.concurrent.TimeUnit
 import kotlin.reflect.full.starProjectedType
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -97,34 +94,3 @@ fun Any.assertComponentsNotEmpty() {
 fun <T : Comparable<T>> List<T>.assertDescending(tag: String) {
     assertEquals(sortedDescending(), this, "$tag not sorted in descending order")
 }
-
-interface CompletableCallback {
-    fun onComplete()
-    fun onError(message: String)
-}
-
-inline fun concurrentTest(crossinline caller: (callback: CompletableCallback) -> Unit) {
-    val result = Completable.create { emitter ->
-        caller(object : CompletableCallback {
-            override fun onComplete() = emitter.onComplete()
-            override fun onError(message: String) = emitter.onError(Throwable(message))
-        })
-    }.blockingGet(5, TimeUnit.SECONDS)
-    if (result != null)
-        throw RuntimeException("Concurrent fail: ${result.message}")
-}
-
-class InternalTest {
-    @Test
-    fun concurrentTest() = try {
-        concurrentTest { result ->
-            Thread().run {
-                Thread.sleep(100)
-                result.onError("Intentional fail")
-            }
-        }
-        fail("Did not throw exception")
-    } catch (e: Exception) {
-        // pass
-    }
-}
-- 
cgit v1.2.3