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

Some fixes

This commit is contained in:
tom79 2019-06-07 14:09:51 +02:00
parent 673234beee
commit aa726c55d6
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/app/fedilab/android/client/API.java
View File

@ -223,33 +223,36 @@ public class API {
nodeInfos.add(nodeInfo);
}
if( nodeInfos.size() > 0){
NodeInfo nodeInfo = nodeInfos.get(0);
NodeInfo nodeInfo = nodeInfos.get(nodeInfos.size()-1);
response = new HttpsConnection(context, this.instance).get(nodeInfo.getHref(), 30, null, null);
JSONObject resobj = new JSONObject(response);
JSONObject jsonObject = resobj.getJSONObject("software");
String name = jsonObject.getString("name").toUpperCase();
if( resobj.has("features") ) {
JSONArray features = resobj.getJSONArray("features");
for( int counter = 0; counter < features.length(); counter++ ) {
if( features.getString(counter).toUpperCase().equals("MASTODON_API") ) {
name = "MASTODON";
break;
String name= null;
if( resobj.has("metadata") && resobj.getJSONObject("metadata").has("features") ) {
JSONArray features = resobj.getJSONObject("metadata").getJSONArray("features");
if( features != null && features.length() > 0){
for( int counter = 0; counter < features.length(); counter++ ) {
if( features.getString(counter).toUpperCase().equals("MASTODON_API") ) {
name = "MASTODON";
break;
}
}
}
}
if( jsonObject.getString("name") != null ){
switch (jsonObject.getString("name").toUpperCase()){
case "PLEROMA":
name = "MASTODON";
break;
case "GNUSOCIAL":
case "HUBZILLA":
case "REDMATRIX":
case "FRIENDICA":
name = "GNU";
break;
if( name == null) {
name = jsonObject.getString("name").toUpperCase();
if (jsonObject.getString("name") != null) {
switch (jsonObject.getString("name").toUpperCase()) {
case "PLEROMA":
name = "MASTODON";
break;
case "GNUSOCIAL":
case "HUBZILLA":
case "REDMATRIX":
case "FRIENDICA":
name = "GNU";
break;
}
}
}
instanceNodeInfo.setName(name);