Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Allows url for instance field when log in

This commit is contained in:
stom79 2019-01-26 12:45:51 +01:00
parent 12095a1bdc
commit 10326a0e65
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java
View File

@ -60,6 +60,8 @@ import org.json.JSONException;
import org.json.JSONObject;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
import java.util.HashMap;
@ -398,8 +400,17 @@ public class LoginActivity extends BaseActivity {
}
private void retrievesClientId(){
String instanceFromField = login_instance.getText().toString().trim();
String host;
try {
instance = URLEncoder.encode(login_instance.getText().toString().trim(), "utf-8");
URL url = new URL(instanceFromField);
host = url.getHost();
} catch (MalformedURLException e) {
e.printStackTrace();
host = instanceFromField;
}
try {
instance = URLEncoder.encode(host, "utf-8");
} catch (UnsupportedEncodingException e) {
Toasty.error(LoginActivity.this,getString(R.string.client_error), Toast.LENGTH_LONG).show();
}