From 5bf69d27d333559f20132027f15977d036eb8430 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Mon, 7 Sep 2020 19:23:08 +0300
Subject: [PATCH] Login page: remove EteSync-specific string + update forgot
 password link.

---
 app/src/main/java/com/etesync/syncadapter/Constants.java | 2 +-
 app/src/main/res/layout/login_credentials_fragment.xml   | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/Constants.java b/app/src/main/java/com/etesync/syncadapter/Constants.java
index 8dc1e370..9c008ab0 100644
--- a/app/src/main/java/com/etesync/syncadapter/Constants.java
+++ b/app/src/main/java/com/etesync/syncadapter/Constants.java
@@ -32,7 +32,7 @@ public class Constants {
     public static final Uri dashboard = webUri.buildUpon().appendEncodedPath("dashboard/").build();
     public static final Uri faqUri = webUri.buildUpon().appendEncodedPath("faq/").build();
     public static final Uri helpUri = webUri.buildUpon().appendEncodedPath("user-guide/android/").build();
-    public static final Uri forgotPassword = webUri.buildUpon().appendEncodedPath("accounts/password/reset/").build();
+    public static final Uri forgotPassword = faqUri.buildUpon().fragment("forgot-password").build();
 
     public static final Uri serviceUrl = Uri.parse((DEBUG_REMOTE_URL == null) ? "https://api.etesync.com/" : DEBUG_REMOTE_URL);
     public static final String etebaseServiceUrl = (DEBUG_REMOTE_URL == null) ? "https://api.etebase.com/partner/etesync/" : DEBUG_REMOTE_URL;
diff --git a/app/src/main/res/layout/login_credentials_fragment.xml b/app/src/main/res/layout/login_credentials_fragment.xml
index 09d0efa9..5cd89950 100644
--- a/app/src/main/res/layout/login_credentials_fragment.xml
+++ b/app/src/main/res/layout/login_credentials_fragment.xml
@@ -29,12 +29,6 @@
                 android:text="@string/login_enter_service_details"
                 android:layout_marginBottom="14dp"/>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/login_service_details_description"
-                android:layout_marginBottom="14dp"/>
-
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"