me/Fedilab
1
0
Fork 0
forked from mirrors/Fedilab
Code Issues Pull requests Projects Releases Packages Wiki Activity

Display reports

Browse source
This commit is contained in:
Thomas 2022-11-12 17:30:06 +01:00
parent 2d87254ac0
commit f213b0ddcb
4 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
View file

@ -330,7 +330,6 @@ public class AccountReportActivity extends BaseActivity {
} }
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) { if (item.getItemId() == android.R.id.home) {

49
app/src/main/java/app/fedilab/android/activities/LoginActivity.java
View file

@ -67,29 +67,34 @@ public class LoginActivity extends BaseActivity {
String scope = requestedAdmin ? Helper.OAUTH_SCOPES_ADMIN : Helper.OAUTH_SCOPES; String scope = requestedAdmin ? Helper.OAUTH_SCOPES_ADMIN : Helper.OAUTH_SCOPES;
oauthVM.createToken(currentInstanceLogin, "authorization_code", client_idLogin, client_secretLogin, Helper.REDIRECT_CONTENT_WEB, scope, code) oauthVM.createToken(currentInstanceLogin, "authorization_code", client_idLogin, client_secretLogin, Helper.REDIRECT_CONTENT_WEB, scope, code)
.observe(LoginActivity.this, tokenObj -> { .observe(LoginActivity.this, tokenObj -> {
Account account = new Account(); if (tokenObj != null) {
account.client_id = client_idLogin; Account account = new Account();
account.client_secret = client_secretLogin; account.client_id = client_idLogin;
account.token = tokenObj.token_type + " " + tokenObj.access_token; account.client_secret = client_secretLogin;
account.api = apiLogin; account.token = tokenObj.token_type + " " + tokenObj.access_token;
account.software = softwareLogin; account.api = apiLogin;
account.instance = currentInstanceLogin; account.software = softwareLogin;
//API call to retrieve account information for the new token account.instance = currentInstanceLogin;
AccountsVM accountsVM = new ViewModelProvider(LoginActivity.this).get(AccountsVM.class); //API call to retrieve account information for the new token
accountsVM.getConnectedAccount(currentInstanceLogin, account.token).observe(LoginActivity.this, mastodonAccount -> { AccountsVM accountsVM = new ViewModelProvider(LoginActivity.this).get(AccountsVM.class);
account.mastodon_account = mastodonAccount; accountsVM.getConnectedAccount(currentInstanceLogin, account.token).observe(LoginActivity.this, mastodonAccount -> {
account.user_id = mastodonAccount.id; account.mastodon_account = mastodonAccount;
//We check if user have really moderator rights account.user_id = mastodonAccount.id;
if (requestedAdmin) { //We check if user have really moderator rights
AdminVM adminVM = new ViewModelProvider(LoginActivity.this).get(AdminVM.class); if (requestedAdmin) {
adminVM.getAccount(account.instance, account.token, account.user_id).observe(LoginActivity.this, adminAccount -> { AdminVM adminVM = new ViewModelProvider(LoginActivity.this).get(AdminVM.class);
account.admin = adminAccount != null; adminVM.getAccount(account.instance, account.token, account.user_id).observe(LoginActivity.this, adminAccount -> {
account.admin = adminAccount != null;
WebviewConnectActivity.proceedLogin(LoginActivity.this, account);
});
} else {
WebviewConnectActivity.proceedLogin(LoginActivity.this, account); WebviewConnectActivity.proceedLogin(LoginActivity.this, account);
}); }
} else { });
WebviewConnectActivity.proceedLogin(LoginActivity.this, account); } else {
} Toasty.error(LoginActivity.this, getString(R.string.toast_token), Toast.LENGTH_LONG).show();
}); }
}); });
} }
} }

2
app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
View file

@ -1786,7 +1786,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
MastodonHelper.scheduleBoost(context, MastodonHelper.ScheduleType.BOOST, statusToDeal, null, null); MastodonHelper.scheduleBoost(context, MastodonHelper.ScheduleType.BOOST, statusToDeal, null, null);
} else if (itemId == R.id.action_admin) { } else if (itemId == R.id.action_admin) {
Intent intent = new Intent(context, AccountReportActivity.class); Intent intent = new Intent(context, AccountReportActivity.class);
intent.putExtra(Helper.ARG_ACCOUNT, statusToDeal.account); intent.putExtra(Helper.ARG_ACCOUNT_ID, statusToDeal.account.id);
context.startActivity(intent); context.startActivity(intent);
} else if (itemId == R.id.action_open_browser) { } else if (itemId == R.id.action_open_browser) {
Helper.openBrowser(context, statusToDeal.url); Helper.openBrowser(context, statusToDeal.url);

1
app/src/main/res/layout/drawer_report.xml
View file

@ -27,7 +27,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/account_pp" android:id="@+id/account_pp"
android:layout_width="60dp" android:layout_width="60dp"