From bd7da76b14ab823c5feb808d03c7a4cba14b380a Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 24 Sep 2017 20:50:08 -0400
Subject: Fix/adblock (#338)

* Rename none to no notifications

* Add pgl adblock and adblock class

* Add faq

* Line spacing
---
 app/src/main/res/values/strings_pref_notifications.xml | 1 +
 app/src/main/res/xml/frost_changelog.xml               | 2 +-
 app/src/main/res/xml/frost_faq.xml                     | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values/strings_pref_notifications.xml b/app/src/main/res/values/strings_pref_notifications.xml
index 6d8c5d5e..9530cdaa 100644
--- a/app/src/main/res/values/strings_pref_notifications.xml
+++ b/app/src/main/res/values/strings_pref_notifications.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <string name="notification_frequency">Notification Frequency</string>
+    <string name="no_notifications">No Notifications</string>
     <string name="notification_keywords">Keywords</string>
     <string name="notification_keywords_desc">Does not notify when notification contains any of these keys.</string>
     <string name="add_keyword">Add Keyword</string>
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 1a753986..2962a508 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -11,7 +11,7 @@
     <item text="Set background back to white on non facebook pages" />
 	<item text="Make read notification/message colors more obvious" />
 	<item text="Clean up and small bug fixes" />
-	<item text="" />
+	<item text="Fix facebook link parsing issue for many links" />
 	<item text="" />
 	<item text="" />
 
diff --git a/app/src/main/res/xml/frost_faq.xml b/app/src/main/res/xml/frost_faq.xml
index 1830ed33..79a786a7 100644
--- a/app/src/main/res/xml/frost_faq.xml
+++ b/app/src/main/res/xml/frost_faq.xml
@@ -16,7 +16,12 @@
     This is also why I don&apos;t require the wakelock permission]]></answer>
 
     <question><![CDATA[Can I disable auto play for videos?]]></question>
-    <answer><![CDATA[Facebook already has a toggle. <br/> Go to menu &rarr; account settings &rarr; videos <br/> and change it from there.]]></answer>
+    <answer>
+        <![CDATA[Facebook already has a toggle. <br/> Go to menu &rarr; account settings &rarr; videos <br/> and change it from there.]]></answer>
+
+    <question><![CDATA[The overlay is not loading!]]></question>
+    <answer><![CDATA[This usually happens if you try sharing something to Facebook from your browser, which is logged into a different account.
+    In this case, make sure you switch Frost to the right account first, as we cannot auto detect it.]]></answer>
 
     <!--
     <question><![CDATA[]]></question>
-- 
cgit v1.2.3