From ab7ec131b62ac1567e983c846c921bd3ada11dd4 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 7 Aug 2017 14:56:48 -0700
Subject: Fix/2FA (#115)

* Create basis for downloading videos

* Resolve some download errors and allow video to be opened in external apps

* Remove url checks for loging

* Update readme with build links

* Allow for all apks to build

* Fix travis apk uploads

* Fix null mapping

* Fix some notation

* Add commit message to test builds

* Remove faulty commit from test release

* Add intent overriding to login web client

* Add resource logging

* Add intent verification without url check

* Simplify login activity

* Check start activity for result

* Add check before resolving intent

* Fix wrong index

* Temporary fix for 2FA login with U2F (#116)

* Clean up and add comments
---
 .../com/pitchedapps/frost/activities/LoginActivity.kt | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
index 8503145e..47c286fa 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
@@ -1,5 +1,6 @@
 package com.pitchedapps.frost.activities
 
+import android.content.Intent
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.os.Handler
@@ -27,7 +28,6 @@ import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.BiFunction
 import io.reactivex.internal.operators.single.SingleToObservable
-import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.SingleSubject
 
 
@@ -42,8 +42,6 @@ class LoginActivity : BaseActivity() {
     val textview: AppCompatTextView by bindView(R.id.textview)
     val profile: ImageView by bindView(R.id.profile)
 
-    val loginObservable = SingleSubject.create<CookieModel>()
-    val progressObservable = BehaviorSubject.create<Int>()!!
     val profileObservable = SingleSubject.create<Boolean>()
     val usernameObservable = SingleSubject.create<String>()
 
@@ -62,17 +60,14 @@ class LoginActivity : BaseActivity() {
         setSupportActionBar(toolbar)
         setTitle(R.string.kau_login)
         setFrostColors(toolbar)
-        web.loginObservable = loginObservable
-        web.progressObservable = progressObservable
-        loginObservable.observeOn(AndroidSchedulers.mainThread()).subscribe {
+        web.loadLogin({ refresh = it != 100 }) {
             cookie ->
+            L.d("Login found")
             web.fadeOut(onFinish = {
                 profile.fadeIn()
                 loadInfo(cookie)
             })
         }
-        progressObservable.observeOn(AndroidSchedulers.mainThread()).subscribe { refresh = it != 100 }
-        web.loadLogin()
     }
 
     fun loadInfo(cookie: CookieModel) {
@@ -124,4 +119,12 @@ class LoginActivity : BaseActivity() {
     fun loadUsername(cookie: CookieModel) {
         cookie.fetchUsername { usernameObservable.onSuccess(it) }
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == 999) {
+            L.d("Result found for activity with result $resultCode")
+            L.d("Intent data ${data?.extras.toString()}")
+        } else
+            super.onActivityResult(requestCode, resultCode, data)
+    }
 }
\ No newline at end of file
-- 
cgit v1.2.3