From 38eadca4e21f986d70da1a54df1eedcbbe414bc4 Mon Sep 17 00:00:00 2001 From: Grishka Date: Sat, 30 Apr 2022 00:02:13 +0300 Subject: [PATCH] Report fixes --- .../fragments/report/ReportAddPostsChoiceFragment.java | 8 ++++++++ .../fragments/report/ReportReasonChoiceFragment.java | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java index da9b137ec..61377f2c5 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java @@ -15,6 +15,7 @@ import android.widget.TextView; import com.squareup.otto.Subscribe; +import org.joinmastodon.android.E; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses; import org.joinmastodon.android.events.FinishReportFragmentsEvent; @@ -60,6 +61,13 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{ setRetainInstance(true); setListLayoutId(R.layout.fragment_content_report_posts); setLayout(R.layout.fragment_report_posts); + E.register(this); + } + + @Override + public void onDestroy(){ + E.unregister(this); + super.onDestroy(); } @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java index 13580c17c..be83dc475 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java @@ -5,7 +5,9 @@ import android.os.Bundle; import com.squareup.otto.Subscribe; import org.joinmastodon.android.R; +import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.events.FinishReportFragmentsEvent; +import org.joinmastodon.android.model.Instance; import org.joinmastodon.android.model.ReportReason; import org.parceler.Parcels; @@ -21,7 +23,10 @@ public class ReportReasonChoiceFragment extends BaseReportChoiceFragment{ protected void populateItems(){ items.add(new Item(getString(R.string.report_reason_personal), getString(R.string.report_reason_personal_subtitle), ReportReason.PERSONAL.name())); items.add(new Item(getString(R.string.report_reason_spam), getString(R.string.report_reason_spam_subtitle), ReportReason.SPAM.name())); - items.add(new Item(getString(R.string.report_reason_violation), getString(R.string.report_reason_violation_subtitle), ReportReason.VIOLATION.name())); + Instance inst=AccountSessionManager.getInstance().getInstanceInfo(AccountSessionManager.getInstance().getAccount(accountID).domain); + if(inst!=null && inst.rules!=null && !inst.rules.isEmpty()){ + items.add(new Item(getString(R.string.report_reason_violation), getString(R.string.report_reason_violation_subtitle), ReportReason.VIOLATION.name())); + } items.add(new Item(getString(R.string.report_reason_other), getString(R.string.report_reason_other_subtitle), ReportReason.OTHER.name())); }