mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-10-05 21:39:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Delete webView.getSettings().setDomStorageEnabled(true); in LoginActivity to fix wrong password error. Show an info to guide users how to type in 2FA code.

Browse Source
This commit is contained in:
Alex Ning
2020-07-19 14:12:26 +08:00
parent f37a46e2c2
commit 5f18f7df64
4 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/res/layout/activity_login.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/coordinator_layout_login_activity"
tools:application="ml.docilealligator.infinityforreddit.Activity.LoginActivity">
<com.google.android.material.appbar.AppBarLayout
@@ -22,10 +23,28 @@
</com.google.android.material.appbar.AppBarLayout>
<ml.docilealligator.infinityforreddit.CustomView.LollipopBugFixedWebView
android:id="@+id/webview_login_activity"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<TextView
android:id="@+id/two_fa_infO_text_view_login_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:drawablePadding="32dp"
android:text="@string/login_activity_2fa_prompt"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" />
<ml.docilealligator.infinityforreddit.CustomView.LollipopBugFixedWebView
android:id="@+id/webview_login_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/values/strings.xml
View File

@@ -847,7 +847,7 @@
<string name="load_video_in_redgifs">Try loading the video on Redgifs</string>
<string name="top_score">%1$s pts</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="login_activity_2fa_prompt">If you have 2-factor authentication enabled, kindly type your password like the following: &lt;password&gt;:&lt;2FA code&gt;.\nExample: yourpass:123456</string>
</resources>

2
app/src/main/res/xml/interface_preference.xml
View File

@@ -30,7 +30,7 @@
<Preference
app:title="@string/settings_time_format_title"
app:fragment="ml.docilealligator.infinityforreddit.Settings.TimeFormatPreferenceFragment" />
<SwitchPreference
app:defaultValue="false"
app:key="vote_buttons_on_the_right"