From 421b5f5d229eae59ad26ef42b3e32de31f01696f Mon Sep 17 00:00:00 2001
From: Distopico Vegan <distopico@riseup.net>
Date: Sun, 8 Nov 2020 01:15:16 -0500
Subject: [PATCH] update notes about gmail authentication

---
 app/src/main/res/values-en/strings.xml | 4 ++--
 app/src/main/res/values/dimens.xml     | 2 +-
 app/src/main/res/values/strings.xml    | 4 ++--
 docs/FAQ.md                            | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 23cf4861..d8ec82cf 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -263,6 +263,6 @@
   <string name="title_reset">Reset</string>
   <string name="title_color">Color</string>
   <string name="title_cancel">Cancel</string>
-  <string name="text_gmail_note"><![CDATA[Require have plain IMAP authentication enabled <font color=\'#0055C7\'>More info</font>]]></string>
-  <string name="message_gmail_note"><![CDATA[Since January 2020 Gmail restricted the oAuth scopes, now requires authorization to be able to authenticate, we have plans to fix this and allow oAuth authentication without privative libraries.<br/><br/> As a temporary solution you need to allow IMAP authentication or how Google says <i>\"less secure apps\"</i>.<br/><br/><b>Instructions here:</b> https://support.google.com/accounts/answer/6010255</br>]]></string>
+  <string name="text_gmail_note"><![CDATA[Require have non-oAuth authentication enabled <font color=\'#0055C7\'>More info</font>]]></string>
+  <string name="message_gmail_note"><![CDATA[Since January 2020 Gmail restricted the oAuth scopes, now requires authorization to be able to authenticate, we are looking the best way to fix oAuth authentication without privative libraries.<br/><br/> As a temporary solution you need to allow normal authentication or how Google says <i>\"less secure apps\"</i>.<br/><br/><b>Instructions here:</b> https://support.google.com/accounts/answer/6010255</br>]]></string>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 50bfeb74..47c79b5f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -15,5 +15,5 @@
     <dimen name="compose_padding">6dp</dimen>
     <dimen name="input_height">40dp</dimen>
     <dimen name="normal_size">40dp</dimen>
-    <dimen name="color_pick">40dp</dimen>
+    <dimen name="color_pick">30dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02594521..bfa36084 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -307,6 +307,6 @@
   <string name="title_reset">Reset</string>
   <string name="title_color">Color</string>
   <string name="title_cancel">Cancel</string>
-  <string name="text_gmail_note"><![CDATA[Require have plain IMAP authentication enabled <font color=\'#0055C7\'>More info</font>]]></string>
-  <string name="message_gmail_note"><![CDATA[Since January 2020 Gmail restricted the oAuth scopes, now requires authorization to be able to authenticate, we have plans to fix this and allow oAuth authentication without privative libraries.<br/><br/> As a temporary solution you need to allow IMAP authentication or how Google says <i>\"less secure apps\"</i>.<br/><br/><b>Instructions here:</b> https://support.google.com/accounts/answer/6010255</br>]]></string>
+  <string name="text_gmail_note"><![CDATA[Require have non-oAuth authentication enabled <font color=\'#0055C7\'>More info</font>]]></string>
+  <string name="message_gmail_note"><![CDATA[Since January 2020 Gmail restricted the oAuth scopes, now requires authorization to be able to authenticate, we are looking the best way to fix oAuth authentication without privative libraries.<br/><br/> As a temporary solution you need to allow normal authentication or how Google says <i>\"less secure apps\"</i>.<br/><br/><b>Instructions here:</b> https://support.google.com/accounts/answer/6010255</br>]]></string>
 </resources>
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 4e2ef11a..496cb990 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -68,10 +68,10 @@ Without [IMAP IDLE](https://en.wikipedia.org/wiki/IMAP_IDLE) emails need to be p
 
 #### How can I login to Gmail / G suite?
 
-Since January 2020 Gmail restricted the scopes, now requires authorization 'oAuth' to be able to authenticate,
-we have plans to fix this and allow oAuth authentication without privative libraries.
+Since January 2020 Gmail restricted the oAuth scopes, now requires authorization to be able to authenticate,
+we are looking the best way to fix oAuth authentication without privative libraries.
 
-As a temporary solution you need to allow IMAP authentication or how Google says "less secure apps".
+As a temporary solution you need to allow normal authentication (non-oAuth) or how Google says "less secure apps".
 See here for instructions: [https://support.google.com/accounts/answer/6010255](https://support.google.com/accounts/answer/6010255)
 
 #### Why are messages in the outbox not moved to the sent folder?