From 6943976bf150c723cd55cbfb145257ce14471f91 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 7 Apr 2018 14:41:28 -0400 Subject: Fix useragent update (#845) * Test windows user agent * Update dependencies * Update KAU * Switch back user agent and use android base * Fix lint issues * Fix lint part 2 * Test messenger user agent * Update bugsnag release levels --- .../main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt | 4 ++-- app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt index 21bc2354..0cd7dacd 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt @@ -52,7 +52,7 @@ import com.pitchedapps.frost.dbflow.loadFbTabs import com.pitchedapps.frost.enums.MainActivityLayout import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.facebook.FbItem -import com.pitchedapps.frost.facebook.PROFILE_PICTURE_URL +import com.pitchedapps.frost.facebook.profilePictureUrl import com.pitchedapps.frost.fragments.BaseFragment import com.pitchedapps.frost.fragments.WebFragment import com.pitchedapps.frost.parsers.FrostSearch @@ -191,7 +191,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract, selectionSecondLineShown = false cookies().forEach { (id, name) -> profile(name = name ?: "") { - iconUrl = PROFILE_PICTURE_URL(id) + iconUrl = profilePictureUrl(id) textColor = Prefs.textColor.toLong() selectedTextColor = Prefs.textColor.toLong() selectedColor = 0x00000001.toLong() 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 7e989fc6..dd0649b3 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt @@ -20,7 +20,7 @@ import com.pitchedapps.frost.dbflow.CookieModel import com.pitchedapps.frost.dbflow.fetchUsername import com.pitchedapps.frost.dbflow.loadFbCookiesAsync import com.pitchedapps.frost.facebook.FbCookie -import com.pitchedapps.frost.facebook.PROFILE_PICTURE_URL +import com.pitchedapps.frost.facebook.profilePictureUrl import com.pitchedapps.frost.glide.FrostGlide import com.pitchedapps.frost.glide.GlideApp import com.pitchedapps.frost.glide.transform @@ -110,7 +110,7 @@ class LoginActivity : BaseActivity() { private fun loadProfile(id: Long) { - profileLoader.load(PROFILE_PICTURE_URL(id)) + profileLoader.load(profilePictureUrl(id)) .transform(FrostGlide.roundCorner).listener(object : RequestListener { override fun onResourceReady(resource: Drawable?, model: Any?, target: Target?, dataSource: DataSource?, isFirstResource: Boolean): Boolean { profileSubject.onSuccess(true) -- cgit v1.2.3