Commit f213b0dd authored by Thomas's avatar Thomas
Browse files

Display reports

parent 2d87254a

app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -330,7 +330,6 @@ public class AccountReportActivity extends BaseActivity { 
        }



    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == android.R.id.home) {

app/src/main/java/app/fedilab/android/activities/LoginActivity.java

+27 −22
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public class LoginActivity extends BaseActivity { 
            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)

                    .observe(LoginActivity.this, tokenObj -> {

                        if (tokenObj != null) {

                            Account account = new Account();

                            account.client_id = client_idLogin;

                            account.client_secret = client_secretLogin;
@@ -90,6 +91,10 @@ public class LoginActivity extends BaseActivity { 
                                    WebviewConnectActivity.proceedLogin(LoginActivity.this, account);

                                }

                            });

                        } else {

                            Toasty.error(LoginActivity.this, getString(R.string.toast_token), Toast.LENGTH_LONG).show();

                        }



                    });

        }

    }

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -1786,7 +1786,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                    MastodonHelper.scheduleBoost(context, MastodonHelper.ScheduleType.BOOST, statusToDeal, null, null);

                } else if (itemId == R.id.action_admin) {

                    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);

                } else if (itemId == R.id.action_open_browser) {

                    Helper.openBrowser(context, statusToDeal.url);

app/src/main/res/layout/drawer_report.xml

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal">



        <androidx.appcompat.widget.AppCompatImageView

            android:id="@+id/account_pp"

            android:layout_width="60dp"