diff options
author | Allan Wang <me@allanwang.ca> | 2017-06-20 16:32:43 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-06-20 16:32:43 -0700 |
commit | 13b8505674e08cc1610ce7e77d7db8fa292372cf (patch) | |
tree | 29ae719c5639f518e2337afdab3bffbf5e4d2598 /app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt | |
parent | e916afddb89550d7f99f17e1477ad17f3bd770f9 (diff) | |
download | frost-13b8505674e08cc1610ce7e77d7db8fa292372cf.tar.gz frost-13b8505674e08cc1610ce7e77d7db8fa292372cf.tar.bz2 frost-13b8505674e08cc1610ce7e77d7db8fa292372cf.zip |
Fix up settings and overlay web
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt index 1660d8db..8df7f1bd 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt @@ -8,10 +8,7 @@ import ca.allanwang.kau.utils.* import com.jude.swipbackhelper.SwipeBackHelper import com.mikepenz.google_material_typeface_library.GoogleMaterial import com.pitchedapps.frost.facebook.FbCookie -import com.pitchedapps.frost.utils.ARG_URL -import com.pitchedapps.frost.utils.Prefs -import com.pitchedapps.frost.utils.formattedFbUrl -import com.pitchedapps.frost.utils.setFrostColors +import com.pitchedapps.frost.utils.* import com.pitchedapps.frost.web.FrostWebView @@ -32,7 +29,7 @@ open class WebOverlayActivity : AppCompatActivity() { get() = intent.extras!!.getString(ARG_URL).formattedFbUrl val userId: Long - get() = intent.extras?.getLong(ARG_USER_ID) ?: Prefs.userId + get() = intent.extras?.getLong(ARG_USER_ID, Prefs.userId) ?: Prefs.userId override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -53,7 +50,7 @@ open class WebOverlayActivity : AppCompatActivity() { frostWeb.web.setupWebview(url) frostWeb.web.addTitleListener({ toolbar.title = it }) - + L.d("UU $userId") if (userId != Prefs.userId) FbCookie.switchUser(userId) { frostWeb.web.loadBaseUrl() } else frostWeb.web.loadBaseUrl() } |