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

Fix actions

This commit is contained in:
tom79 2019-06-22 13:42:47 +02:00
parent 2f18004e44
commit f08626cc68
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ import static app.fedilab.android.client.API.adminAction.SUSPEND;
public class AccountReportActivity extends BaseActivity implements OnAdminActionInterface {
TextView permissions, username, email, email_status, login_status, joined, recent_ip;
TextView permissions, username, email, email_status, login_status, joined, recent_ip, comment_label;
Button warn, disable, silence, suspend;
private String account_id;
private CheckBox email_user;
@ -107,7 +107,7 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
disable = findViewById(R.id.disable);
silence = findViewById(R.id.silence);
suspend = findViewById(R.id.suspend);
comment_label = findViewById(R.id.comment_label);
permissions = findViewById(R.id.permissions);
username = findViewById(R.id.username);
email = findViewById(R.id.email);
@ -216,18 +216,20 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
if( !accountAdmin.isDisabled() ) {
disable.setText(getString(R.string.disable));
disable.setEnabled(true);
}else{
disable.setText(getString(R.string.undisable));
disable.setText(getString(R.string.disabled));
disable.setEnabled(false);
}
disable.setOnClickListener(view->{
if( !accountAdmin.isSilenced()) {
if( !accountAdmin.isDisabled()) {
AdminAction adminAction = new AdminAction();
adminAction.setType(DISABLE);
adminAction.setSend_email_notification(email_user.isChecked());
adminAction.setText(comment.getText().toString().trim());
new PostAdminActionAsyncTask(getApplicationContext(), DISABLE, account_id, adminAction, AccountReportActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}else{
new PostAdminActionAsyncTask(getApplicationContext(), API.adminAction.UNSUSPEND, account_id, null, AccountReportActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
//new PostAdminActionAsyncTask(getApplicationContext(), API.adminAction.UNDISABLE, account_id, null, AccountReportActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
});
@ -260,9 +262,9 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
case DISABLE:
message = getString(R.string.account_disabled);
break;
case UNDISABLE:
/* case UNDISABLE:
message = getString(R.string.account_undisabled);
break;
break;*/
case SUSPEND:
message = getString(R.string.account_suspended);
break;
@ -314,6 +316,7 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
if( accountAdmin.getDomain() == null || accountAdmin.getDomain().equals("null")){
warn.setVisibility(View.VISIBLE);
email_user.setVisibility(View.VISIBLE);
comment_label.setVisibility(View.VISIBLE);
comment.setVisibility(View.VISIBLE);
recent_ip.setText(accountAdmin.getIp());
disable.setVisibility(View.VISIBLE);
@ -328,6 +331,7 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
email.setText("-");
disable.setVisibility(View.GONE);
suspend.setVisibility(View.VISIBLE);
comment_label.setVisibility(View.GONE);
}
if( accountAdmin.getRole().equals("admin") || accountAdmin.getRole().equals("mod")){
warn.setVisibility(View.GONE);
@ -337,6 +341,7 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
email_user.setVisibility(View.GONE);
email_user.setChecked(false);
comment.setVisibility(View.GONE);
comment_label.setVisibility(View.GONE);
}
joined.setText(Helper.dateToString(accountAdmin.getCreated_at()));

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

@ -19,7 +19,6 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle;
import android.util.Log;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -126,7 +125,6 @@ public class API {
REJECT,
NONE,
SILENCE,
UNDISABLE,
DISABLE,
UNSILENCE,
SUSPEND,
@ -381,6 +379,7 @@ public class API {
case APPROVE:
case REJECT:
case UNSILENCE:
// case UNDISABLE:
case UNSUSPEND:
List<AccountAdmin> accountAdmins = null;
try {