From d94bc858c8a0c273d87d705eb06d35cfd9cf9e08 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 25 Jul 2017 15:18:12 -0700
Subject: Update image downloads , IAB, and many issue reports (#95)

* Remove iab proguard line

* Remove dup vending aidl

* Fix double calling issue

* Change pro logging

* Remove async call

* Allow for multiple result flags from settings

* Rename restore to get

* Remove remaining async

* Add null checks across web clients

* Do not delete temp file on save

* Implement image logic

* Update file chooser

* Update travis

* Add intent checker

* Update dependencies

* Update dependencies

* Add debugging option

* Switch context for login glide

* Scan newly added files

* Update theme

* Allow image downloading in messages

* Finalize beta release

* Build to beta

* Update strings
---
 app/src/main/res/layout/activity_main.xml   |  3 +--
 app/src/main/res/values/strings.xml         |  6 ++++++
 app/src/main/res/values/strings_errors.xml  |  1 +
 app/src/main/res/values/strings_preferences |  4 ++--
 app/src/main/res/xml/frost_changelog.xml    | 22 ++++++++++++----------
 5 files changed, 22 insertions(+), 14 deletions(-)

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

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 91bcc4c8..0da7f179 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -44,7 +44,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_margin"
-        android:visibility="gone"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
+        android:visibility="gone" />
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9e62e734..92ab2491 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,8 +42,14 @@
     <string name="subject">Subject</string>
     <string name="share">Share</string>
     <string name="share_link">Share Link</string>
+    <string name="debug_link">Debug Link</string>
+    <string name="debug_link_subject">Frost for Facebook: Link Debug</string>
+    <string name="debug_link_content">Write here. Note that your link may contain private information, but I won\'t be able to see it as the post isn\'t public. The url will still help with debugging though.</string>
+    <string name="debug_link_desc">If a link isn\'t loading properly, you can email me so I can help debug it. Clicking okay will open an email request</string>
     <string name="copy_link">Copy Link</string>
     <string name="copy_text">Copy Text</string>
+    <string name="debug_image_link_subject">Frost for Facebook: Image Link Debug</string>
+
 
     <string name="no_longer_facebook">No longer under facebook; refreshing…</string>
 
diff --git a/app/src/main/res/values/strings_errors.xml b/app/src/main/res/values/strings_errors.xml
index 162114f7..eb74ce60 100644
--- a/app/src/main/res/values/strings_errors.xml
+++ b/app/src/main/res/values/strings_errors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="null_url_overlay">Empty url given to overlay; exiting</string>
+    <string name="bad_image_overlay">The url could not be loaded properly. Would you like to send it for debugging?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_preferences b/app/src/main/res/values/strings_preferences
index 81545f1c..0bb1d22f 100644
--- a/app/src/main/res/values/strings_preferences
+++ b/app/src/main/res/values/strings_preferences
@@ -13,7 +13,7 @@
     <string name="experimental">Experimental</string>
     <string name="experimental_desc">Enable early access to potentially unstable features</string>
 
-    <string name="restore_purchases">Restore Purchases</string>
-    <string name="restore_purchases_desc">Restore any previous purchases from the Play Store</string>
+    <string name="get_pro">Get Frost Pro</string>
+    <string name="get_pro_desc">Purchase or restore pro and unlock the full potential of Frost! Includes ad blockers, custom themes, full configurations, and much more to come!</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 7964c0e9..cc77c661 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -8,16 +8,8 @@
     <item text="" />
     -->
 
-    <version title="Beta Updates" />
-
-    <item text="Fix regex bug for some devices" />
-    <item text="Fix notification text" />
-    <item text="Update round icons" />
-    <item text="" />
-    <item text="" />
-    <item text="" />
-    <item text="" />
-    <item text="" />
+    <!--<version title="Beta Updates" />-->
+	
 
     <version title="v1.4" />
     <item text="Update IAB helper" />
@@ -29,6 +21,16 @@
     <item text="Aggressively filter nonrecent posts in recents mode" />
     <item text="Add download option for full sized images" />
     <item text="Fix rounded icons" />
+	<item text="Fix regex bug for some devices" />
+    <item text="Fix notification text" />
+    <item text="Update round icons" />
+	<item text="Allow for multiple result flags in settings to better reload the main view" />
+    <item text="Add custom image picker" />
+    <item text="Check if activities can open intent before loading in browser" />
+    <item text="Add url debugging. Long press a button and press debug link to send me an email" />
+    <item text="Update theme" />
+    <item text="Move search bar style to default" />
+    <item text="Allow for image downloads in messages" />
 
     <version title="v1.3" />
     <item text="Create toggle for notifications only from primary account" />
-- 
cgit v1.2.3