From c7b09f223e6b5d9d9dc94a1a0d3b88f35ab61513 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Mon, 16 Sep 2019 00:03:07 +0800
Subject: Support 2FA. Fixed time parsing in messages.

---
 .../main/java/ml/docilealligator/infinityforreddit/FetchMessages.java   | 2 +-
 .../main/java/ml/docilealligator/infinityforreddit/LoginActivity.java   | 1 +
 app/src/main/res/values/strings.xml                                     | 1 +
 app/src/main/res/xml/main_preferences.xml                               | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchMessages.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchMessages.java
index f2fc9b3a..bc738b83 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchMessages.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchMessages.java
@@ -87,7 +87,7 @@ class FetchMessages {
 
                 Calendar submitTimeCalendar = Calendar.getInstance();
                 submitTimeCalendar.setTimeInMillis(timeUTC);
-                String formattedTime = new SimpleDateFormat("MMM d, YYYY, HH:mm",
+                String formattedTime = new SimpleDateFormat("MMM d, yyyy, HH:mm",
                         locale).format(submitTimeCalendar.getTime());
 
                 messages.add(new Message(kind, subredditName, subredditNamePrefixed, id, fullname, subject,
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/LoginActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/LoginActivity.java
index 9b053749..fc19b2c4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/LoginActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/LoginActivity.java
@@ -92,6 +92,7 @@ public class LoginActivity extends AppCompatActivity {
 
         WebView webView = findViewById(R.id.webview_login_activity);
         webView.getSettings().setJavaScriptEnabled(true);
+        webView.getSettings().setDomStorageEnabled(true);
 
         Uri baseUri = Uri.parse(RedditUtils.OAUTH_URL);
         Uri.Builder uriBuilder = baseUri.buildUpon();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a029821d..b5b5e949 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -273,6 +273,7 @@
     <string name="settings_theme_system_default_summary">Device default</string>
     <string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string>
     <string name="settings_enable_nsfw_title">Enable NSFW</string>
+    <string name="settings_layout_no_limits_title">Display under navigation bar and status bar</string>
     <string name="settings_about_master_title">About</string>
     <string name="settings_acknowledgement_master_title">Acknowledgement</string>
     <string name="settings_credits_master_title">Credits</string>
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index bdf0f2a6..e8ed98d8 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -27,7 +27,7 @@
     <SwitchPreference
         app:defaultValue="false"
         app:key="nsfw"
-        app:title="@string/settings_enable_nsfw_title"/>
+        app:title="@string/settings_enable_nsfw_title" />
 
     <Preference
         app:title="@string/settings_about_master_title"
-- 
cgit v1.2.3