Show instance details

This commit is contained in:
tom79 2019-11-16 11:36:00 +01:00
parent 397527094a
commit 8cef86270a
8 changed files with 600 additions and 22 deletions

View File

@ -470,6 +470,10 @@
android:name="app.fedilab.android.activities.InstanceHealthActivity"
android:excludeFromRecents="true"
android:theme="@style/Base.V7.Theme.AppCompat.Dialog" />
<activity
android:name="app.fedilab.android.activities.InstanceProfileActivity"
android:excludeFromRecents="true"
android:theme="@style/Base.V7.Theme.AppCompat.Dialog" />
<activity
android:name="app.fedilab.android.activities.ProxyActivity"
android:excludeFromRecents="true"

View File

@ -0,0 +1,176 @@
/* Copyright 2019 Thomas Schneider
*
* This file is a part of Fedilab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
* see <http://www.gnu.org/licenses>. */
package app.fedilab.android.activities;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.text.Html;
import android.text.SpannableString;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import java.util.ArrayList;
import java.util.List;
import app.fedilab.android.R;
import app.fedilab.android.asynctasks.RetrieveAccountsAsyncTask;
import app.fedilab.android.client.API;
import app.fedilab.android.client.Entities.Account;
import app.fedilab.android.client.Entities.InstanceNodeInfo;
import app.fedilab.android.drawers.AccountsListAdapter;
import app.fedilab.android.helper.Helper;
import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
/**
* Created by Thomas on 15/11/2019.
* Instance info activity class
*/
public class InstanceProfileActivity extends BaseActivity {
private TextView name, description, userCount, statusCount, instanceCount, software, version;
private String instance;
private RecyclerView lv_accounts;
private LinearLayout instance_container;
private ImageView back_ground_image;
private RelativeLayout loader;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if (theme == Helper.THEME_LIGHT) {
setTheme(R.style.Dialog);
} else {
setTheme(R.style.DialogDark);
}
setContentView(R.layout.activity_instance_profile);
getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
Bundle b = getIntent().getExtras();
if (getSupportActionBar() != null)
getSupportActionBar().hide();
if (b != null)
instance = b.getString("instance",null);
if( instance == null){
finish();
}
Button close = findViewById(R.id.close);
name = findViewById(R.id.name);
description = findViewById(R.id.description);
userCount = findViewById(R.id.user_count);
statusCount = findViewById(R.id.status_count);
instanceCount = findViewById(R.id.instance_count);
instance_container = findViewById(R.id.instance_container);
loader = findViewById(R.id.loader);
back_ground_image = findViewById(R.id.back_ground_image);
software = findViewById(R.id.software);
version = findViewById(R.id.version);
lv_accounts = findViewById(R.id.lv_accounts);
close.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
finish();
}
});
checkInstance();
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
private void checkInstance() {
if (instance == null)
return;
new Thread(new Runnable() {
@Override
public void run() {
try {
InstanceNodeInfo instanceNodeInfo = new API(InstanceProfileActivity.this).instanceInfo(instance.trim());
runOnUiThread(new Runnable() {
public void run() {
if( instanceNodeInfo == null){
finish();
return;
}
if (instanceNodeInfo.getThumbnail() != null && !instanceNodeInfo.getThumbnail().equals("null"))
Glide.with(getApplicationContext())
.asBitmap()
.load(instanceNodeInfo.getThumbnail())
.into(back_ground_image);
name.setText(instanceNodeInfo.getNodeName());
SpannableString descriptionSpan;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
descriptionSpan = new SpannableString(Html.fromHtml(instanceNodeInfo.getNodeDescription(), FROM_HTML_MODE_LEGACY));
else
descriptionSpan = new SpannableString(Html.fromHtml(instanceNodeInfo.getNodeDescription()));
description.setText(descriptionSpan, TextView.BufferType.SPANNABLE);
userCount.setText(Helper.withSuffix((instanceNodeInfo.getNumberOfUsers())));
statusCount.setText(Helper.withSuffix((instanceNodeInfo.getNumberOfPosts())));
instanceCount.setText(Helper.withSuffix((instanceNodeInfo.getNumberOfInstance())));
software.setText(instanceNodeInfo.getName() + " - ");
version.setText(instanceNodeInfo.getVersion());
if( instanceNodeInfo.getStaffAccount() != null){
List<Account> accounts = new ArrayList<>();
accounts.add(instanceNodeInfo.getStaffAccount());
final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
AccountsListAdapter accountsListAdapter = new AccountsListAdapter(RetrieveAccountsAsyncTask.Type.FOLLOWERS, userId, accounts);
lv_accounts.setAdapter(accountsListAdapter);
final LinearLayoutManager mLayoutManager;
mLayoutManager = new LinearLayoutManager(InstanceProfileActivity.this);
lv_accounts.setLayoutManager(mLayoutManager);
}
instance_container.setVisibility(View.VISIBLE);
loader.setVisibility(View.GONE);
}
});
} catch (Exception ignored) {
}
}
}).start();
}
}

View File

@ -870,7 +870,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
instance = account.getAcct().split("@")[1];
}
InstanceNodeInfo instanceNodeInfo = new API(ShowAccountActivity.this).displayNodeInfo(instance);
String finalInstance = instance;
runOnUiThread(new Runnable() {
public void run() {
if (instanceNodeInfo != null && instanceNodeInfo.getName() != null) {
@ -879,6 +879,15 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
instance_info.setVisibility(View.VISIBLE);
TextView seperator = findViewById(R.id.seperator);
seperator.setVisibility(View.VISIBLE);
instance_info.setOnClickListener(v -> {
Intent intent = new Intent(getApplicationContext(), InstanceProfileActivity.class);
Bundle b = new Bundle();
b.putString("instance", finalInstance);
intent.putExtras(b);
startActivity(intent);
});
}
}
});

View File

@ -1283,8 +1283,7 @@ public class API {
e.printStackTrace();
}
}
} catch (JSONException ignored) {
} catch (ParseException e) {
} catch (JSONException | ParseException e) {
e.printStackTrace();
}
return account;
@ -1820,11 +1819,7 @@ public class API {
apiResponse.setAccountAdmins(accountAdmins);
break;
}
} catch (IOException e) {
e.printStackTrace();
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
} catch (KeyManagementException e) {
} catch (IOException | NoSuchAlgorithmException | KeyManagementException e) {
e.printStackTrace();
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
@ -1897,6 +1892,103 @@ public class API {
return instanceNodeInfo;
}
public InstanceNodeInfo instanceInfo(String domain) {
String response;
InstanceNodeInfo instanceNodeInfo = null;
try {
response = new HttpsConnection(context, domain).get("https://" + domain + "/.well-known/nodeinfo", 30, null, null);
JSONArray jsonArray = new JSONObject(response).getJSONArray("links");
ArrayList<NodeInfo> nodeInfos = new ArrayList<>();
try {
instanceNodeInfo = new InstanceNodeInfo();
int i = 0;
while (i < jsonArray.length()) {
JSONObject resobj = jsonArray.getJSONObject(i);
NodeInfo nodeInfo = new NodeInfo();
nodeInfo.setHref(resobj.getString("href"));
nodeInfo.setRel(resobj.getString("rel"));
i++;
nodeInfos.add(nodeInfo);
}
if (nodeInfos.size() > 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;
name = jsonObject.getString("name").toUpperCase();
instanceNodeInfo.setName(name);
instanceNodeInfo.setVersion(jsonObject.getString("version"));
instanceNodeInfo.setOpenRegistrations(resobj.getBoolean("openRegistrations"));
if (name.trim().toUpperCase().compareTo("MASTODON") == 0 || name.trim().toUpperCase().compareTo("PLEROMA") == 0 || name.trim().toUpperCase().compareTo("PIXELFED") == 0){
APIResponse apiResponse = getInstance(domain);
Instance instanceNode = apiResponse.getInstance();
instanceNodeInfo.setNodeDescription(instanceNode.getDescription());
instanceNodeInfo.setNumberOfUsers(instanceNode.getUserCount());
instanceNodeInfo.setNumberOfPosts(instanceNode.getStatusCount());
instanceNodeInfo.setNumberOfInstance(instanceNode.getDomainCount());
instanceNodeInfo.setStaffAccount(instanceNode.getContactAccount());
instanceNodeInfo.setNodeName(instanceNode.getTitle());
instanceNodeInfo.setThumbnail(instanceNode.getThumbnail());
instanceNodeInfo.setVersion(instanceNode.getVersion());
}
if( resobj.has("metadata")){
JSONObject metadata = resobj.getJSONObject("metadata");
if( metadata.has("staffAccounts")){
instanceNodeInfo.setStaffAccountStr(metadata.getString("staffAccounts"));
}
}
if( instanceNodeInfo.getStaffAccountStr() != null && instanceNodeInfo.getStaffAccount() == null){
APIResponse search = searchAccounts(instanceNodeInfo.getStaffAccountStr(), 1);
if( search != null && search.getAccounts() != null && search.getAccounts().size() > 0 ){
instanceNodeInfo.setStaffAccount(search.getAccounts().get(0));
}
}
}
} catch (JSONException e) {
setDefaultError(e);
}
} catch (IOException | JSONException | NoSuchAlgorithmException | KeyManagementException e) {
e.printStackTrace();
} catch (HttpsConnection.HttpsConnectionException e){
APIResponse apiResponse = getInstance(domain);
instanceNodeInfo = new InstanceNodeInfo();
instanceNodeInfo.setName("MASTODON");
Instance instanceNode = apiResponse.getInstance();
instanceNodeInfo.setNodeDescription(instanceNode.getDescription());
instanceNodeInfo.setNumberOfUsers(instanceNode.getUserCount());
instanceNodeInfo.setNumberOfPosts(instanceNode.getStatusCount());
instanceNodeInfo.setNumberOfInstance(instanceNode.getDomainCount());
instanceNodeInfo.setStaffAccount(instanceNode.getContactAccount());
instanceNodeInfo.setNodeName(instanceNode.getTitle());
instanceNodeInfo.setThumbnail(instanceNode.getThumbnail());
instanceNodeInfo.setVersion(instanceNode.getVersion());
}
return instanceNodeInfo;
}
/***
* Get info on the current Instance *synchronously*
* @return APIResponse
*/
public APIResponse getInstance(String instance) {
try {
String response = new HttpsConnection(context, this.instance).get("https://"+instance+"/api/v1/instance", 30, null, prefKeyOauthTokenT);
Instance instanceEntity = parseInstance(new JSONObject(response));
apiResponse.setInstance(instanceEntity);
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
return apiResponse;
}
/***
* Get info on the current Instance *synchronously*
* @return APIResponse
@ -1908,13 +2000,7 @@ public class API {
apiResponse.setInstance(instanceEntity);
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} catch (KeyManagementException e) {
e.printStackTrace();
} catch (JSONException e) {
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
return apiResponse;
@ -1932,13 +2018,7 @@ public class API {
apiResponse.setInstanceRegs(instanceRegs);
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} catch (KeyManagementException e) {
e.printStackTrace();
} catch (JSONException e) {
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
return apiResponse;
@ -5569,6 +5649,24 @@ public class API {
poll_limits.put("max_expiration", polllimits.getInt("max_expiration"));
instance.setPoll_limits(poll_limits);
}
if( resobj.has("thumbnail")){
instance.setThumbnail(resobj.getString("thumbnail"));
}
if( resobj.has("stats")){
JSONObject stats = resobj.getJSONObject("stats");
if( stats.has("user_count")) {
instance.setUserCount(stats.getInt("user_count"));
}
if( stats.has("status_count")) {
instance.setStatusCount(stats.getInt("status_count"));
}
if( stats.has("domain_count")) {
instance.setDomainCount(stats.getInt("domain_count"));
}
}
if( resobj.has("contact_account")){
instance.setContactAccount(parseAccountResponse(context, resobj.getJSONObject("contact_account")));
}
} catch (JSONException e) {
e.printStackTrace();
}

View File

@ -30,6 +30,11 @@ public class Instance {
private String version;
private boolean registration;
private boolean approval_required;
private Account contactAccount;
private int userCount;
private int statusCount;
private int domainCount;
private String thumbnail;
private HashMap<String, Integer> poll_limits;
@ -96,4 +101,44 @@ public class Instance {
public void setApproval_required(boolean approval_required) {
this.approval_required = approval_required;
}
public Account getContactAccount() {
return contactAccount;
}
public void setContactAccount(Account contactAccount) {
this.contactAccount = contactAccount;
}
public int getUserCount() {
return userCount;
}
public void setUserCount(int userCount) {
this.userCount = userCount;
}
public int getStatusCount() {
return statusCount;
}
public void setStatusCount(int statusCount) {
this.statusCount = statusCount;
}
public int getDomainCount() {
return domainCount;
}
public void setDomainCount(int domainCount) {
this.domainCount = domainCount;
}
public String getThumbnail() {
return thumbnail;
}
public void setThumbnail(String thumbnail) {
this.thumbnail = thumbnail;
}
}

View File

@ -17,9 +17,18 @@ package app.fedilab.android.client.Entities;
public class InstanceNodeInfo {
private String name;
private String title;
private String version;
private boolean openRegistrations;
private boolean connectionError;
private int numberOfUsers = 0;
private int numberOfPosts = 0;
private int numberOfInstance = 0;
private String staffAccountStr;
private Account staffAccount;
private String nodeName;
private String nodeDescription;
private String thumbnail;
public String getName() {
return name;
@ -52,4 +61,76 @@ public class InstanceNodeInfo {
public void setConnectionError(boolean connectionError) {
this.connectionError = connectionError;
}
public int getNumberOfUsers() {
return numberOfUsers;
}
public void setNumberOfUsers(int numberOfUsers) {
this.numberOfUsers = numberOfUsers;
}
public int getNumberOfPosts() {
return numberOfPosts;
}
public void setNumberOfPosts(int numberOfPosts) {
this.numberOfPosts = numberOfPosts;
}
public String getStaffAccountStr() {
return staffAccountStr;
}
public void setStaffAccountStr(String staffAccountStr) {
this.staffAccountStr = staffAccountStr;
}
public Account getStaffAccount() {
return staffAccount;
}
public void setStaffAccount(Account staffAccount) {
this.staffAccount = staffAccount;
}
public String getNodeName() {
return nodeName;
}
public void setNodeName(String nodeName) {
this.nodeName = nodeName;
}
public String getNodeDescription() {
return nodeDescription;
}
public void setNodeDescription(String nodeDescription) {
this.nodeDescription = nodeDescription;
}
public String getThumbnail() {
return thumbnail;
}
public void setThumbnail(String thumbnail) {
this.thumbnail = thumbnail;
}
public int getNumberOfInstance() {
return numberOfInstance;
}
public void setNumberOfInstance(int numberOfInstance) {
this.numberOfInstance = numberOfInstance;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
}

View File

@ -0,0 +1,162 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="450dp"
android:layout_margin="@dimen/fab_margin"
android:fitsSystemWindows="true"
tools:context="app.fedilab.android.activities.InstanceHealthActivity">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha="0.2">
<ImageView
android:id="@+id/back_ground_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/logo_of_the_instance"
android:scaleType="centerCrop" />
</RelativeLayout>
<LinearLayout
android:id="@+id/instance_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/fab_margin"
android:layout_marginEnd="@dimen/fab_margin"
android:orientation="vertical"
android:visibility="gone"
>
<TextView
android:background="@drawable/blue_border"
android:id="@+id/name"
android:textColor="@color/mastodonC4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:layout_margin="10dp"
android:textSize="20sp" />
<TextView
android:layout_margin="5dp"
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:autoLink="web"
android:gravity="center"
android:textSize="14sp" />
<LinearLayout
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/user_count"/>
<TextView
android:id="@+id/user_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_count"/>
<TextView
android:id="@+id/status_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/instance_count"/>
<TextView
android:id="@+id/instance_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="end">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="italic"
android:textSize="12sp"
android:id="@+id/software"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="italic"
android:textSize="12sp"
android:id="@+id/version"/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:layout_marginTop="20dp"
android:id="@+id/lv_accounts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@null"
android:scrollbars="none" />
<Button
android:id="@+id/close"
style="@style/Base.Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:text="@string/close"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
<RelativeLayout
android:id="@+id/loader"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true" />
</RelativeLayout>
</RelativeLayout>

View File

@ -1148,4 +1148,7 @@
<string name="theme_file_error">An error occurred when selecting the theme file</string>
<string name="export_bookmarks">Export bookmarks to the instance</string>
<string name="import_bookmarks">Import bookmarks from the instance</string>
<string name="user_count">User count</string>
<string name="status_count">Status count</string>
<string name="instance_count">Instance count</string>
</resources>