aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2021-01-10 20:50:20 -0800
committerAllan Wang <me@allanwang.ca>2021-01-10 20:50:20 -0800
commitfb122b7af6e230e9458ab7d892d5d20f551b98ed (patch)
tree5b1e4ed08bc2b2ce2c3247e18becde7ff23347f7 /app
parent7ad9fdfc6ff5faebb9588335013d1f414d3d0bad (diff)
downloadfrost-fb122b7af6e230e9458ab7d892d5d20f551b98ed.tar.gz
frost-fb122b7af6e230e9458ab7d892d5d20f551b98ed.tar.bz2
frost-fb122b7af6e230e9458ab7d892d5d20f551b98ed.zip
Rename old messenger scss to messages
Diffstat (limited to 'app')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt1
-rw-r--r--app/src/web/scss/core/_core_messages.scss (renamed from app/src/web/scss/core/_core_messenger.scss)2
-rw-r--r--app/src/web/scss/core/core.scss2
4 files changed, 4 insertions, 3 deletions
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 9edcc496..7a65a818 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbConst.kt
@@ -24,7 +24,7 @@ const val FACEBOOK_COM = "facebook.com"
const val FBCDN_NET = "fbcdn.net"
const val WWW_FACEBOOK_COM = "www.$FACEBOOK_COM"
const val HTTPS_FACEBOOK_COM = "https://$WWW_FACEBOOK_COM"
-const val HTTPS_MESSENGER_COM = "https://www.messenger.com/"
+const val HTTPS_MESSENGER_COM = "https://www.messenger.com"
const val FACEBOOK_BASE_COM = "m.$FACEBOOK_COM"
const val FB_URL_BASE = "https://$FACEBOOK_BASE_COM/"
const val FACEBOOK_MBASIC_COM = "mbasic.$FACEBOOK_COM"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
index 78d51aef..36d51ec9 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
@@ -117,6 +117,7 @@ class FbCookie(private val prefs: Prefs, private val cookieDao: CookieDao) {
}
withContext(Dispatchers.IO + NonCancellable) {
L.d { "Switching User" }
+ // TODO save old messenger cookie
prefs.userId = cookie.id
CookieManager.getInstance().apply {
removeAllCookies()
diff --git a/app/src/web/scss/core/_core_messenger.scss b/app/src/web/scss/core/_core_messages.scss
index 608fc23d..aa3c04eb 100644
--- a/app/src/web/scss/core/_core_messenger.scss
+++ b/app/src/web/scss/core/_core_messages.scss
@@ -1,4 +1,4 @@
-// Not all messenger related components are here; only the main ones.
+// Not all message related components are here; only the main ones.
// Borders for instance are merged into core_border
// Other person's message bubble
diff --git a/app/src/web/scss/core/core.scss b/app/src/web/scss/core/core.scss
index 38086529..112c0003 100644
--- a/app/src/web/scss/core/core.scss
+++ b/app/src/web/scss/core/core.scss
@@ -3,7 +3,7 @@
@import "core_text";
@import "core_bg";
@import "core_border";
-@import "core_messenger";
+@import "core_messages";
//GLOBAL overrides; use with caution
*, *::after, *::before {