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

Some improvements

This commit is contained in:
tom79 2019-06-30 15:30:45 +02:00
parent 04737529d1
commit 55a7b6a652
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/app/fedilab/android/activities/AdminActivity.java
View File

@ -35,6 +35,7 @@ import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
import app.fedilab.android.R;
import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
import app.fedilab.android.fragments.DisplayAdminAccountsFragment;
import app.fedilab.android.fragments.DisplayAdminReportsFragment;
import app.fedilab.android.fragments.DisplayStatusFragment;
@ -160,6 +161,11 @@ public class AdminActivity extends BaseActivity {
final MenuItem itemDisabled = menu.findItem(R.id.action_disabled);
final MenuItem itemSilenced = menu.findItem(R.id.action_silenced);
final MenuItem itemSuspended = menu.findItem(R.id.action_suspended);
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA){
itemSilenced.setVisible(false);
itemPending.setVisible(false);
itemSuspended.setVisible(false);
}
itemLocal.setChecked(local);
itemRemote.setChecked(remote);
@ -190,6 +196,7 @@ public class AdminActivity extends BaseActivity {
});
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
item.setActionView(new View(getApplicationContext()));
item.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {

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

@ -248,13 +248,13 @@ public class API {
endpoint = "/admin/accounts";
}else if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA){
if (adminAction.isLocal())
params.put("local", String.valueOf(adminAction.isLocal()));
params.put("filters","local");
if (adminAction.isRemote())
params.put("external", String.valueOf(adminAction.isRemote()));
params.put("filters","external");
if (adminAction.isActive())
params.put("active", String.valueOf(adminAction.isActive()));
params.put("filters","active");
if (adminAction.isDisabled())
params.put("deactivated", String.valueOf(adminAction.isDisabled()));
params.put("filters","deactivated");
endpoint = "/admin/users";
}
break;