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-22 11:47:39 +02:00
parent 4d57b9e164
commit 494dbc635f
2 changed files with 78 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,12 +15,15 @@ package app.fedilab.android.activities;
* see <http://www.gnu.org/licenses>. */
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
@ -137,6 +140,7 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
Group statuses_group = findViewById(R.id.statuses_group);
statuses_group.setVisibility(View.VISIBLE);
}
account_id = targeted_account.getId();
fillReport(targeted_account);
}
@ -158,60 +162,6 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
Toasty.error(getApplicationContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show();
return;
}
switch (accountAdmin.getRole()){
case "user":
permissions.setText(getString(R.string.user));
break;
case "mod":
permissions.setText(getString(R.string.moderator));
break;
case "admin":
permissions.setText(getString(R.string.administrator));
break;
}
username.setText(String.format("@%s", accountAdmin.getAccount().getAcct()));
email.setText(accountAdmin.getEmail());
email_status.setText(accountAdmin.isConfirmed()?getString(R.string.confirmed):getString(R.string.unconfirmed));
if( accountAdmin.isDisabled()){
login_status.setText(getString(R.string.disabled));
}else if( accountAdmin.isSilenced()){
login_status.setText(getString(R.string.silenced));
}else if( accountAdmin.isSuspended()){
login_status.setText(getString(R.string.suspended));
}else{
login_status.setText(getString(R.string.active));
}
if( accountAdmin.getDomain() == null || accountAdmin.getDomain().equals("null")){
warn.setVisibility(View.VISIBLE);
email_user.setVisibility(View.VISIBLE);
comment.setVisibility(View.VISIBLE);
recent_ip.setText(accountAdmin.getIp());
disable.setVisibility(View.GONE);
suspend.setVisibility(View.VISIBLE);
}else{
warn.setVisibility(View.GONE);
email_user.setVisibility(View.GONE);
email_user.setChecked(false);
comment.setVisibility(View.GONE);
recent_ip.setText("-");
permissions.setText("-");
email.setText("-");
disable.setVisibility(View.VISIBLE);
suspend.setVisibility(View.GONE);
}
if( accountAdmin.getRole().equals("admin") || accountAdmin.getRole().equals("mod")){
warn.setVisibility(View.GONE);
suspend.setVisibility(View.GONE);
silence.setVisibility(View.GONE);
disable.setVisibility(View.GONE);
email_user.setVisibility(View.GONE);
email_user.setChecked(false);
comment.setVisibility(View.GONE);
}
joined.setText(Helper.dateToString(accountAdmin.getCreated_at()));
warn.setOnClickListener(view->{
AdminAction adminAction = new AdminAction();
@ -277,10 +227,10 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
String message = null;
switch (accountAdmin.getAction()) {
case SILENCE:
message = getString(R.string.account_silenced);
message = getString(R.string.account_silenced);
break;
case UNSILENCE:
message = getString(R.string.account_unsilenced);
message = getString(R.string.account_unsilenced);
break;
case DISABLE:
message = getString(R.string.account_disabled);
@ -301,6 +251,70 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
if( message != null){
Toasty.success(getApplicationContext(), message, Toast.LENGTH_LONG).show();
}
comment.setText("");
InputMethodManager imm = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(comment.getWindowToken(), 0);
}
if( accountAdmin.getRole() == null) {
return;
}
switch (accountAdmin.getRole()) {
case "user":
permissions.setText(getString(R.string.user));
break;
case "mod":
permissions.setText(getString(R.string.moderator));
break;
case "admin":
permissions.setText(getString(R.string.administrator));
break;
}
username.setText(String.format("@%s", accountAdmin.getAccount().getAcct()));
email.setText(accountAdmin.getEmail());
email_status.setText(accountAdmin.isConfirmed()?getString(R.string.confirmed):getString(R.string.unconfirmed));
if( accountAdmin.isDisabled()){
login_status.setText(getString(R.string.disabled));
}else if( accountAdmin.isSilenced()){
login_status.setText(getString(R.string.silenced));
}else if( accountAdmin.isSuspended()){
login_status.setText(getString(R.string.suspended));
}else{
login_status.setText(getString(R.string.active));
}
if( accountAdmin.getDomain() == null || accountAdmin.getDomain().equals("null")){
warn.setVisibility(View.VISIBLE);
email_user.setVisibility(View.VISIBLE);
comment.setVisibility(View.VISIBLE);
recent_ip.setText(accountAdmin.getIp());
disable.setVisibility(View.GONE);
suspend.setVisibility(View.VISIBLE);
}else{
warn.setVisibility(View.GONE);
email_user.setVisibility(View.GONE);
email_user.setChecked(false);
comment.setVisibility(View.GONE);
recent_ip.setText("-");
permissions.setText("-");
email.setText("-");
disable.setVisibility(View.VISIBLE);
suspend.setVisibility(View.GONE);
}
if( accountAdmin.getRole().equals("admin") || accountAdmin.getRole().equals("mod")){
warn.setVisibility(View.GONE);
suspend.setVisibility(View.GONE);
silence.setVisibility(View.GONE);
disable.setVisibility(View.GONE);
email_user.setVisibility(View.GONE);
email_user.setChecked(false);
comment.setVisibility(View.GONE);
}
joined.setText(Helper.dateToString(accountAdmin.getCreated_at()));
}
}

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

@ -298,9 +298,7 @@ public class API {
return apiResponse;
}
/**
* Execute admin post actions
* @param action type of the action
@ -412,10 +410,15 @@ public class API {
break;
case NONE:
accountAdmins = new ArrayList<>();
AccountAdmin accountAdmin = new AccountAdmin();
accountAdmin.setAction(action);
accountAdmins.add(accountAdmin);
apiResponse.setAccountAdmins(accountAdmins);
break;
case DISABLE:
accountAdmins = new ArrayList<>();
AccountAdmin accountAdmin = new AccountAdmin();
accountAdmin = new AccountAdmin();
accountAdmin.setDisabled(true);
accountAdmin.setAction(action);
accountAdmins.add(accountAdmin);
@ -446,6 +449,7 @@ public class API {
e.printStackTrace();
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
e.printStackTrace();
}
return apiResponse;
}