From 2d5e73dcd47fd3c98436a089b44c556d0938539f Mon Sep 17 00:00:00 2001
From: Antoine POPINEAU <antoine.popineau@appscho.com>
Date: Wed, 23 Oct 2019 22:05:56 +0200
Subject: [PATCH] Fix crash on illegal characters in URL. Fixed caret and error
 color on login form.

---
 .../apognu/otter/activities/LoginActivity.kt  | 46 +++++++++++--------
 app/src/main/res/layout/activity_login.xml    | 12 ++---
 app/src/main/res/values/colors.xml            |  2 +-
 app/src/main/res/values/styles.xml            |  6 +--
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/github/apognu/otter/activities/LoginActivity.kt b/app/src/main/java/com/github/apognu/otter/activities/LoginActivity.kt
index ca8f0a5..df14a2b 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/LoginActivity.kt
+++ b/app/src/main/java/com/github/apognu/otter/activities/LoginActivity.kt
@@ -49,8 +49,6 @@ class LoginActivity : AppCompatActivity() {
           else e.message
 
         hostname_field.error = message
-
-        return@setOnClickListener
       }
 
       hostname_field.error = ""
@@ -65,27 +63,37 @@ class LoginActivity : AppCompatActivity() {
       }
 
       GlobalScope.launch(Main) {
-        val result = Fuel.post("$hostname/api/v1/token", body)
-          .awaitObjectResult(gsonDeserializerOf(FwCredentials::class.java))
+        try {
+          val result = Fuel.post("$hostname/api/v1/token", body)
+            .awaitObjectResult(gsonDeserializerOf(FwCredentials::class.java))
 
-        result.fold(
-          { data ->
-            PowerPreference.getFileByName(AppContext.PREFS_CREDENTIALS).apply {
-              setString("hostname", hostname)
-              setString("username", username)
-              setString("password", password)
-              setString("access_token", data.token)
+          result.fold(
+            { data ->
+              PowerPreference.getFileByName(AppContext.PREFS_CREDENTIALS).apply {
+                setString("hostname", hostname)
+                setString("username", username)
+                setString("password", password)
+                setString("access_token", data.token)
+              }
+
+              dialog.dismiss()
+              startActivity(Intent(this@LoginActivity, MainActivity::class.java))
+            },
+            { error ->
+              dialog.dismiss()
+
+              hostname_field.error = error.localizedMessage
             }
+          )
+        } catch (e: Exception) {
+          dialog.dismiss()
 
-            dialog.dismiss()
-            startActivity(Intent(this@LoginActivity, MainActivity::class.java))
-          },
-          { error ->
-            dialog.dismiss()
+          val message =
+            if (e.message?.isEmpty() == true) getString(R.string.login_error_hostname)
+            else e.message
 
-            hostname_field.error = error.localizedMessage
-          }
-        )
+          hostname_field.error = message
+        }
       }
     }
   }
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 681af59..e2a3632 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -33,7 +33,6 @@
     android:hint="@string/login_hostname"
     android:textColorHint="@drawable/login_input"
     app:boxStrokeColor="@drawable/login_input"
-    app:errorTextAppearance="@style/AppTheme.ErrorStyle"
     app:hintTextColor="@drawable/login_input">
 
     <com.google.android.material.textfield.TextInputEditText
@@ -42,7 +41,8 @@
       android:layout_height="wrap_content"
       android:inputType="textUri"
       android:lines="1"
-      android:textColor="@android:color/white" />
+      android:textColor="@android:color/white"
+      android:textCursorDrawable="@null" />
 
   </com.google.android.material.textfield.TextInputLayout>
 
@@ -55,7 +55,6 @@
     android:hint="@string/login_username"
     android:textColorHint="@drawable/login_input"
     app:boxStrokeColor="@drawable/login_input"
-    app:errorTextAppearance="@style/AppTheme.ErrorStyle"
     app:hintTextColor="@drawable/login_input">
 
     <com.google.android.material.textfield.TextInputEditText
@@ -64,7 +63,8 @@
       android:layout_height="wrap_content"
       android:inputType="textEmailAddress"
       android:lines="1"
-      android:textColor="@android:color/white" />
+      android:textColor="@android:color/white"
+      android:textCursorDrawable="@null" />
 
   </com.google.android.material.textfield.TextInputLayout>
 
@@ -77,7 +77,6 @@
     android:hint="@string/login_password"
     android:textColorHint="@drawable/login_input"
     app:boxStrokeColor="@drawable/login_input"
-    app:errorTextAppearance="@style/AppTheme.ErrorStyle"
     app:hintTextColor="@drawable/login_input"
     app:passwordToggleEnabled="true">
 
@@ -87,7 +86,8 @@
       android:layout_height="wrap_content"
       android:inputType="textPassword"
       android:lines="1"
-      android:textColor="@android:color/white" />
+      android:textColor="@android:color/white"
+      android:textCursorDrawable="@null" />
 
   </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aa9d2b8..2c29aa5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,7 +6,7 @@
   <color name="colorPrimary">#327eae</color>
   <color name="colorPrimaryDark">#3d3e40</color>
   <color name="colorAccent">#d35400</color>
-  <color name="colorError">#b94705</color>
+  <color name="colorError">#fdcfbb</color>
 
   <color name="colorSelected">#dadada</color>
   <color name="colorFavorite">#e17055</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 45f5eee..f239413 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,6 +11,8 @@
     <item name="materialButtonStyle">@style/AppTheme.ButtonStyle</item>
 
     <item name="preferenceTheme">@style/AppTheme.Preference</item>
+
+    <item name="colorError">@color/colorError</item>
   </style>
 
   <style name="AppTheme.Fragment">
@@ -76,8 +78,4 @@
     <item name="android:background">@android:color/transparent</item>
   </style>
 
-  <style name="AppTheme.ErrorStyle" parent="@android:style/TextAppearance">
-    <item name="android:textColor">@color/colorError</item>
-  </style>
-
 </resources>