From 014d8e6cef671f190a288f3704f99e4244ec2267 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sun, 30 Jul 2017 15:38:25 +0200
Subject: [PATCH] Quick fixes - Prepares release 1.3.9.1

---
 app/build.gradle                                  |  4 ++--
 .../etalab/mastodon/activities/LoginActivity.java | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 241f20fe1..5660219c1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "fr.gouv.etalab.mastodon"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 38
-        versionName "1.3.9"
+        versionCode 39
+        versionName "1.3.9.1"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
index 35f7596b5..b6567724d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
@@ -37,6 +37,8 @@ import com.loopj.android.http.RequestParams;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -104,12 +106,7 @@ public class LoginActivity extends AppCompatActivity {
                 connectionButton.setEnabled(false);
                 login_two_step.setVisibility(View.INVISIBLE);
                 if (!hasFocus) {
-                    if( Patterns.WEB_URL.matcher(login_instance.getText().toString().trim()).matches() ){
-                        retrievesClientId();
-                    }else {
-                        Toast.makeText(getApplicationContext(), R.string.toast_error_instance, Toast.LENGTH_LONG).show();
-                    }
-
+                    retrievesClientId();
                 }
             }
         });
@@ -128,7 +125,11 @@ public class LoginActivity extends AppCompatActivity {
 
     private void retrievesClientId(){
         final Button connectionButton = (Button) findViewById(R.id.login_button);
-        instance = login_instance.getText().toString().trim();
+        try {
+            instance =  URLEncoder.encode(login_instance.getText().toString().trim(), "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            Toast.makeText(LoginActivity.this,R.string.client_error, Toast.LENGTH_LONG).show();
+        }
         String action = "/api/v1/apps";
         RequestParams parameters = new RequestParams();
         parameters.add(Helper.CLIENT_NAME, Helper.CLIENT_NAME_VALUE);