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

Fix the warn button not displayed for remote accounts

This commit is contained in:
tom79 2019-06-22 09:38:19 +02:00
parent 21ed8a47f3
commit a7e54b1900
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
View File

@ -175,10 +175,10 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
}else{ }else{
login_status.setText(getString(R.string.active)); login_status.setText(getString(R.string.active));
} }
if( accountAdmin.getEmail() == null){ if( accountAdmin.getDomain() == null || accountAdmin.getDomain().equals("null")){
warn.setVisibility(View.GONE);
}else{
warn.setVisibility(View.VISIBLE); warn.setVisibility(View.VISIBLE);
}else{
warn.setVisibility(View.GONE);
} }
joined.setText(Helper.dateToString(accountAdmin.getCreated_at())); joined.setText(Helper.dateToString(accountAdmin.getCreated_at()));
recent_ip.setText(accountAdmin.getIp()); recent_ip.setText(accountAdmin.getIp());

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

@ -5132,6 +5132,7 @@ public class API {
accountAdmin.setEmail(resobj.getString("email")); accountAdmin.setEmail(resobj.getString("email"));
accountAdmin.setRole(resobj.getString("role")); accountAdmin.setRole(resobj.getString("role"));
accountAdmin.setIp(resobj.getString("ip")); accountAdmin.setIp(resobj.getString("ip"));
accountAdmin.setDomain(resobj.getString("domain"));
accountAdmin.setAccount(parseAccountResponse(context, resobj.getJSONObject("account"))); accountAdmin.setAccount(parseAccountResponse(context, resobj.getJSONObject("account")));
if( !resobj.isNull("confirmed")) { if( !resobj.isNull("confirmed")) {
accountAdmin.setConfirmed(resobj.getBoolean("confirmed")); accountAdmin.setConfirmed(resobj.getBoolean("confirmed"));

17
app/src/main/java/app/fedilab/android/client/Entities/AccountAdmin.java
View File

@ -26,6 +26,7 @@ public class AccountAdmin implements Parcelable {
private String email; private String email;
private String role; private String role;
private String ip; private String ip;
private String domain;
private boolean confirmed; private boolean confirmed;
private boolean suspended; private boolean suspended;
private boolean silenced; private boolean silenced;
@ -122,7 +123,16 @@ public class AccountAdmin implements Parcelable {
} }
public AccountAdmin() {
}
public String getDomain() {
return domain;
}
public void setDomain(String domain) {
this.domain = domain;
}
@Override @Override
public int describeContents() { public int describeContents() {
@ -137,6 +147,7 @@ public class AccountAdmin implements Parcelable {
dest.writeString(this.email); dest.writeString(this.email);
dest.writeString(this.role); dest.writeString(this.role);
dest.writeString(this.ip); dest.writeString(this.ip);
dest.writeString(this.domain);
dest.writeByte(this.confirmed ? (byte) 1 : (byte) 0); dest.writeByte(this.confirmed ? (byte) 1 : (byte) 0);
dest.writeByte(this.suspended ? (byte) 1 : (byte) 0); dest.writeByte(this.suspended ? (byte) 1 : (byte) 0);
dest.writeByte(this.silenced ? (byte) 1 : (byte) 0); dest.writeByte(this.silenced ? (byte) 1 : (byte) 0);
@ -144,9 +155,6 @@ public class AccountAdmin implements Parcelable {
dest.writeParcelable(this.account, flags); dest.writeParcelable(this.account, flags);
} }
public AccountAdmin() {
}
protected AccountAdmin(Parcel in) { protected AccountAdmin(Parcel in) {
this.id = in.readString(); this.id = in.readString();
this.username = in.readString(); this.username = in.readString();
@ -155,6 +163,7 @@ public class AccountAdmin implements Parcelable {
this.email = in.readString(); this.email = in.readString();
this.role = in.readString(); this.role = in.readString();
this.ip = in.readString(); this.ip = in.readString();
this.domain = in.readString();
this.confirmed = in.readByte() != 0; this.confirmed = in.readByte() != 0;
this.suspended = in.readByte() != 0; this.suspended = in.readByte() != 0;
this.silenced = in.readByte() != 0; this.silenced = in.readByte() != 0;
@ -162,7 +171,7 @@ public class AccountAdmin implements Parcelable {
this.account = in.readParcelable(Account.class.getClassLoader()); this.account = in.readParcelable(Account.class.getClassLoader());
} }
public static final Parcelable.Creator<AccountAdmin> CREATOR = new Parcelable.Creator<AccountAdmin>() { public static final Creator<AccountAdmin> CREATOR = new Creator<AccountAdmin>() {
@Override @Override
public AccountAdmin createFromParcel(Parcel source) { public AccountAdmin createFromParcel(Parcel source) {
return new AccountAdmin(source); return new AccountAdmin(source);