From 20ef6500dc0b6d84905d92d8469feb6ff0ac502d Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 30 May 2017 17:26:14 -0700
Subject: migrate to dbflow

---
 .../main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt   |  8 +++-----
 .../main/kotlin/com/pitchedapps/frost/views/LoginWebView.kt   | 11 +++--------
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/views')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt
index f09887d8..a59fa3b1 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt
@@ -10,10 +10,7 @@ import android.support.v4.view.ViewCompat
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
-import android.webkit.WebResourceError
-import android.webkit.WebResourceRequest
-import android.webkit.WebView
-import android.webkit.WebViewClient
+import android.webkit.*
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.ObservableContainer
 import io.reactivex.subjects.BehaviorSubject
@@ -67,8 +64,9 @@ class FrostWebView @JvmOverloads constructor(
             override fun onPageFinished(view: WebView?, url: String?) {
                 super.onPageFinished(view, url)
                 observable.onNext(WebStatus.LOADED)
-//                CookieManager.getInstance().flush()
+                val cookie = CookieManager.getInstance().getCookie(url)
                 L.d("Loaded $url")
+                L.d("Cookie $cookie")
             }
         })
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/LoginWebView.kt
index 7d1948fe..17557b4d 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/LoginWebView.kt
@@ -14,6 +14,7 @@ import com.facebook.AccessToken
 import com.pitchedapps.frost.facebook.FB_KEY
 import com.pitchedapps.frost.facebook.retro.FrostApi.frostApi
 import com.pitchedapps.frost.facebook.retro.Me
+import com.pitchedapps.frost.facebook.retro.enqueueFrost
 import com.pitchedapps.frost.utils.L
 import retrofit2.Call
 import retrofit2.Callback
@@ -63,15 +64,9 @@ class LoginWebView @JvmOverloads constructor(
     fun saveAccessToken(accessToken: String, expiresIn: String, grantedScopes: String?, deniedScopes: String?) {
         L.d("Granted $grantedScopes")
         L.d("Denied $deniedScopes")
-        frostApi.me(accessToken).enqueue(object : Callback<Me> {
-            override fun onFailure(call: Call<Me>?, t: Throwable?) {
-                TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-            }
+        frostApi.me().enqueueFrost { call, response ->
 
-            override fun onResponse(call: Call<Me>, response: Response<Me>) {
-                AccessToken.setCurrentAccessToken(AccessToken(accessToken, FB_KEY.toString(), response.body().id, null, null, null, null, null))
-            }
-        })
+        }
 
     }
 
-- 
cgit v1.2.3