From 6943976bf150c723cd55cbfb145257ce14471f91 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
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
---
 app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt      | 14 +++++++++++---
 .../com/pitchedapps/frost/activities/BaseMainActivity.kt   |  4 ++--
 .../com/pitchedapps/frost/activities/LoginActivity.kt      |  4 ++--
 .../kotlin/com/pitchedapps/frost/enums/OverlayContext.kt   |  2 +-
 .../main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt  |  5 +++--
 .../main/kotlin/com/pitchedapps/frost/views/AccountItem.kt |  4 ++--
 6 files changed, 21 insertions(+), 12 deletions(-)

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

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 118f7eac..cbb3d0ab 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -68,10 +68,18 @@ class FrostApp : Application() {
 //        refWatcher = LeakCanary.install(this)
         if (!BuildConfig.DEBUG) {
             Bugsnag.init(this)
-            Bugsnag.setAutoCaptureSessions(true)
-            Bugsnag.getClient().setUserId(Prefs.frostId)
+            val releaseStage = setOf("production", "releaseTest", "github", "release")
+            Bugsnag.setNotifyReleaseStages(*releaseStage.toTypedArray(), "unnamed")
+            val versionSegments = BuildConfig.VERSION_NAME.split("_")
+            if (versionSegments.size > 1) {
+                Bugsnag.setAppVersion(versionSegments.first())
+                Bugsnag.setReleaseStage(if (versionSegments.last() in releaseStage) versionSegments.last()
+                else "unnamed")
+                Bugsnag.setUserName(BuildConfig.VERSION_NAME)
+            }
 
-//            setUser("userId", "user@email.com", "User Name")
+            Bugsnag.setAutoCaptureSessions(true)
+            Bugsnag.setUserId(Prefs.frostId)
         }
         KL.shouldLog = { BuildConfig.DEBUG }
         Prefs.verboseLogging = false
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<Drawable> {
                     override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
                         profileSubject.onSuccess(true)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/enums/OverlayContext.kt b/app/src/main/kotlin/com/pitchedapps/frost/enums/OverlayContext.kt
index 4f37c6c7..f93a2229 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/enums/OverlayContext.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/enums/OverlayContext.kt
@@ -54,7 +54,7 @@ enum class OverlayContext(private val menuItem: FrostMenuItem?) : EnumBundle<Ove
 class FrostMenuItem(
         val id: Int,
         val fbItem: FbItem,
-        val showAsAction: Int = MenuItem.SHOW_AS_ACTION_ALWAYS) {
+        val showAsAction: Int = MenuItem.SHOW_AS_ACTION_IF_ROOM) {
     fun addToMenu(context: Context, menu: Menu, index: Int) {
         val item = menu.add(Menu.NONE, id, index, fbItem.titleId)
         item.icon = fbItem.icon.toDrawable(context, 18)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
index 6456b0d6..33f6ebe4 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
@@ -8,12 +8,13 @@ const val FACEBOOK_COM = "facebook.com"
 const val FBCDN_NET = "fbcdn.net"
 const val HTTPS_FACEBOOK_COM = "https://$FACEBOOK_COM"
 const val FB_URL_BASE = "https://m.$FACEBOOK_COM/"
-fun PROFILE_PICTURE_URL(id: Long) = "https://graph.facebook.com/$id/picture?type=large"
+fun profilePictureUrl(id: Long) = "https://graph.facebook.com/$id/picture?type=large"
 const val FB_LOGIN_URL = "${FB_URL_BASE}login"
 
 const val USER_AGENT_FULL = "Mozilla/5.0 (Linux; Android 4.4.2; en-us; SAMSUNG SM-G900T Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.6 Chrome/28.0.1500.94 Mobile Safari/537.36"
-const val USER_AGENT_BASIC = "Mozilla/5.0 (BB10; Kbd) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.1.0.4633 Mobile Safari/537.10+"
+const val USER_AGENT_BASIC_OLD = "Mozilla/5.0 (Linux; Android 6.0) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.1.0.4633 Mobile Safari/537.10+"
 const val USER_AGENT_MESSENGER = "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36"
+const val USER_AGENT_BASIC = USER_AGENT_MESSENGER
 
 /**
  * Animation transition delay, just to ensure that the styles
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
index 7058ffe4..7262fa17 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
@@ -14,7 +14,7 @@ import com.bumptech.glide.request.target.Target
 import com.mikepenz.google_material_typeface_library.GoogleMaterial
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.dbflow.CookieModel
-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.utils.Prefs
@@ -32,7 +32,7 @@ class AccountItem(val cookie: CookieModel?) : KauIItem<AccountItem, AccountItem.
             text.setTextColor(Prefs.textColor)
             if (cookie != null) {
                 text.text = cookie.name
-                GlideApp.with(itemView).load(PROFILE_PICTURE_URL(cookie.id))
+                GlideApp.with(itemView).load(profilePictureUrl(cookie.id))
                         .transform(FrostGlide.roundCorner).listener(object : RequestListener<Drawable> {
                             override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
                                 text.fadeIn()
-- 
cgit v1.2.3