Merge branch 'develop'3.26.0

1 files changed, 5 insertions, 1 deletions

diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/admin/FragmentAdminReport.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/admin/FragmentAdminReport.java
index dc3834d85..93f03cd24 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/admin/FragmentAdminReport.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/admin/FragmentAdminReport.java
@@ -15,6 +15,7 @@ package app.fedilab.android.mastodon.ui.fragment.admin;
  * see <http://www.gnu.org/licenses>. */
 
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -24,6 +25,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -69,7 +71,9 @@ public class FragmentAdminReport extends Fragment {
         }
 
         binding = FragmentPaginationBinding.inflate(inflater, container, false);
-
+        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
+        boolean displayScrollBar = sharedpreferences.getBoolean(getString(R.string.SET_TIMELINE_SCROLLBAR), false);
+        binding.recyclerView.setVerticalScrollBarEnabled(displayScrollBar);
         int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
         binding.swipeContainer.setColorSchemeColors(
                 c1, c1, c1