always show follow requests in main menu (#1809)

* always show follow requests in main menu

* update recyclerview to v1.2.0

* fix bug that shows follow requests info to wrong users

app/build.gradle

@@ -113,7 +113,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:1.2.5"
     implementation "androidx.browser:browser:1.3.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.0"
     implementation "androidx.exifinterface:exifinterface:1.3.2"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.preference:preference-ktx:1.1.1"

app/src/main/java/com/keylesspalace/tusky/AccountListActivity.kt

@@ -46,6 +46,7 @@ class AccountListActivity : BaseActivity(), HasAndroidInjector {
 
         val type = intent.getSerializableExtra(EXTRA_TYPE) as Type
         val id: String? = intent.getStringExtra(EXTRA_ID)
+        val accountLocked: Boolean = intent.getBooleanExtra(EXTRA_ACCOUNT_LOCKED, false)
 
         setSupportActionBar(binding.includedToolbar.toolbar)
         supportActionBar?.apply {
@@ -64,7 +65,7 @@ class AccountListActivity : BaseActivity(), HasAndroidInjector {
 
         supportFragmentManager
                 .beginTransaction()
-                .replace(R.id.fragment_container, AccountListFragment.newInstance(type, id))
+                .replace(R.id.fragment_container, AccountListFragment.newInstance(type, id, accountLocked))
                 .commit()
     }
 
@@ -73,12 +74,15 @@ class AccountListActivity : BaseActivity(), HasAndroidInjector {
     companion object {
         private const val EXTRA_TYPE = "type"
         private const val EXTRA_ID = "id"
+        private const val EXTRA_ACCOUNT_LOCKED = "acc_locked"
 
         @JvmStatic
-        fun newIntent(context: Context, type: Type, id: String? = null): Intent {
+        @JvmOverloads
+        fun newIntent(context: Context, type: Type, id: String? = null, accountLocked: Boolean = false): Intent {
             return Intent(context, AccountListActivity::class.java).apply {
                 putExtra(EXTRA_TYPE, type)
                 putExtra(EXTRA_ID, id)
+                putExtra(EXTRA_ACCOUNT_LOCKED, accountLocked)
             }
         }
     }

app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt

@@ -181,7 +181,7 @@ class AccountsInListFragment : DialogFragment(), Injectable {
             binding.notificationTextView.hide()
             binding.acceptButton.hide()
             binding.rejectButton.setOnClickListener {
-                onRemoveFromList(getItem(holder.adapterPosition).id)
+                onRemoveFromList(getItem(holder.bindingAdapterPosition).id)
             }
             binding.rejectButton.contentDescription =
                     binding.root.context.getString(R.string.action_remove_from_list)
@@ -217,7 +217,7 @@ class AccountsInListFragment : DialogFragment(), Injectable {
             binding.notificationTextView.hide()
             binding.acceptButton.hide()
             binding.rejectButton.setOnClickListener {
-                val (account, inAList) = getItem(holder.adapterPosition)
+                val (account, inAList) = getItem(holder.bindingAdapterPosition)
                 if (inAList) {
                     onRemoveFromList(account.id)
                 } else {

app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt

@@ -250,9 +250,9 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector {
 
             override fun onClick(v: View) {
                 if (v == itemView) {
-                    onListSelected(getItem(adapterPosition).id)
+                    onListSelected(getItem(bindingAdapterPosition).id)
                 } else {
-                    onMore(getItem(adapterPosition), v)
+                    onMore(getItem(bindingAdapterPosition), v)
                 }
             }
         }

app/src/main/java/com/keylesspalace/tusky/MainActivity.kt

@@ -121,6 +121,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
 
     private lateinit var glide: RequestManager
 
+    private var accountLocked: Boolean = false
+
     private val emojiInitCallback = object : InitCallback() {
         override fun onInitialized() {
             if (!isDestroyed) {
@@ -399,6 +401,14 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                             startActivityWithSlideInAnimation(intent)
                         }
                     },
+                    primaryDrawerItem {
+                        nameRes = R.string.action_view_follow_requests
+                        iconicsIcon = GoogleMaterial.Icon.gmd_person_add
+                        onClick = {
+                            val intent = AccountListActivity.newIntent(context, AccountListActivity.Type.FOLLOW_REQUESTS, accountLocked = accountLocked)
+                            startActivityWithSlideInAnimation(intent)
+                        }
+                    },
                     primaryDrawerItem {
                         nameRes = R.string.action_lists
                         iconicsIcon = GoogleMaterial.Icon.gmd_list
@@ -660,22 +670,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
         accountManager.updateActiveAccount(me)
         NotificationHelper.createNotificationChannelsForAccount(accountManager.activeAccount!!, this)
 
-        // Show follow requests in the menu, if this is a locked account.
+        accountLocked = me.locked
-        if (me.locked && binding.mainDrawer.getDrawerItem(DRAWER_ITEM_FOLLOW_REQUESTS) == null) {
+
-            val followRequestsItem = primaryDrawerItem {
-                identifier = DRAWER_ITEM_FOLLOW_REQUESTS
-                nameRes = R.string.action_view_follow_requests
-                iconicsIcon = GoogleMaterial.Icon.gmd_person_add
-                onClick = {
-                    val intent = Intent(this@MainActivity, AccountListActivity::class.java)
-                    intent.putExtra("type", AccountListActivity.Type.FOLLOW_REQUESTS)
-                    startActivityWithSlideInAnimation(intent)
-                }
-            }
-            binding.mainDrawer.addItemAtPosition(4, followRequestsItem)
-        } else if (!me.locked) {
-            binding.mainDrawer.removeItems(DRAWER_ITEM_FOLLOW_REQUESTS)
-        }
         updateProfiles()
         updateShortcut(this, accountManager.activeAccount!!)
     }
@@ -789,7 +785,6 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
     companion object {
         private const val TAG = "MainActivity" // logging tag
         private const val DRAWER_ITEM_ADD_ACCOUNT: Long = -13
-        private const val DRAWER_ITEM_FOLLOW_REQUESTS: Long = 10
         private const val DRAWER_ITEM_ANNOUNCEMENTS: Long = 14
         const val STATUS_URL = "statusUrl"
     }

app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt

@@ -109,17 +109,17 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
             }
 
             override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
-                val temp = currentTabs[viewHolder.adapterPosition]
+                val temp = currentTabs[viewHolder.bindingAdapterPosition]
-                currentTabs[viewHolder.adapterPosition] = currentTabs[target.adapterPosition]
+                currentTabs[viewHolder.bindingAdapterPosition] = currentTabs[target.bindingAdapterPosition]
-                currentTabs[target.adapterPosition] = temp
+                currentTabs[target.bindingAdapterPosition] = temp
 
-                currentTabsAdapter.notifyItemMoved(viewHolder.adapterPosition, target.adapterPosition)
+                currentTabsAdapter.notifyItemMoved(viewHolder.bindingAdapterPosition, target.bindingAdapterPosition)
                 saveTabs()
                 return true
             }
 
             override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-                onTabRemoved(viewHolder.adapterPosition)
+                onTabRemoved(viewHolder.bindingAdapterPosition)
             }
 
             override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {

app/src/main/java/com/keylesspalace/tusky/adapter/AccountFieldEditAdapter.kt

@@ -65,7 +65,7 @@ class AccountFieldEditAdapter : RecyclerView.Adapter<BindingHolder<ItemEditField
 
         holder.binding.accountFieldName.addTextChangedListener(object: TextWatcher {
             override fun afterTextChanged(newText: Editable) {
-                fieldData[holder.adapterPosition].first = newText.toString()
+                fieldData[holder.bindingAdapterPosition].first = newText.toString()
             }
 
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
@@ -75,7 +75,7 @@ class AccountFieldEditAdapter : RecyclerView.Adapter<BindingHolder<ItemEditField
 
         holder.binding.accountFieldValue.addTextChangedListener(object: TextWatcher {
             override fun afterTextChanged(newText: Editable) {
-                fieldData[holder.adapterPosition].second = newText.toString()
+                fieldData[holder.bindingAdapterPosition].second = newText.toString()
             }
 
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}

app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java

@@ -95,7 +95,7 @@ public class BlocksAdapter extends AccountAdapter {
 
         void setupActionListener(final AccountActionListener listener) {
             unblock.setOnClickListener(v -> {
-                int position = getAdapterPosition();
+                int position = getBindingAdapterPosition();
                 if (position != RecyclerView.NO_POSITION) {
                     listener.onBlock(false, id, position);
                 }

app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt

@@ -51,13 +51,13 @@ class FollowRequestViewHolder(
 
     fun setupActionListener(listener: AccountActionListener, accountId: String) {
         binding.acceptButton.setOnClickListener {
-            val position = adapterPosition
+            val position = bindingAdapterPosition
             if (position != RecyclerView.NO_POSITION) {
                 listener.onRespondToFollowRequest(true, accountId, position)
             }
         }
         binding.rejectButton.setOnClickListener {
-            val position = adapterPosition
+            val position = bindingAdapterPosition
             if (position != RecyclerView.NO_POSITION) {
                 listener.onRespondToFollowRequest(false, accountId, position)
             }

app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsHeaderAdapter.kt

@@ -0,0 +1,40 @@
+/* Copyright 2020 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.keylesspalace.tusky.R
+
+class FollowRequestsHeaderAdapter(private val instanceName: String, private val accountLocked: Boolean) : RecyclerView.Adapter<HeaderViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HeaderViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.item_follow_requests_header, parent, false) as TextView
+        return HeaderViewHolder(view)
+    }
+
+    override fun onBindViewHolder(viewHolder: HeaderViewHolder, position: Int) {
+        viewHolder.textView.text = viewHolder.textView.context.getString(R.string.follow_requests_info, instanceName)
+    }
+
+    override fun getItemCount() = if (accountLocked) 0 else 1
+
+}
+
+class HeaderViewHolder(var textView: TextView) : RecyclerView.ViewHolder(textView)

app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java

@@ -122,9 +122,9 @@ public class MutesAdapter extends AccountAdapter {
         }
 
         void setupActionListener(final AccountActionListener listener) {
-            unmute.setOnClickListener(v -> listener.onMute(false, id, getAdapterPosition(), false));
+            unmute.setOnClickListener(v -> listener.onMute(false, id, getBindingAdapterPosition(), false));
             muteNotifications.setOnClickListener(
-                v -> listener.onMute(true, id, getAdapterPosition(), !notifications));
+                v -> listener.onMute(true, id, getBindingAdapterPosition(), !notifications));
             itemView.setOnClickListener(v -> listener.onViewAccount(id));
         }
     }

app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java

@@ -541,8 +541,8 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
                 }
 
                 contentWarningButton.setOnClickListener(view -> {
-                    if (getAdapterPosition() != RecyclerView.NO_POSITION) {
+                    if (getBindingAdapterPosition() != RecyclerView.NO_POSITION) {
-                        notificationActionListener.onExpandedChange(!statusViewData.isExpanded(), getAdapterPosition());
+                        notificationActionListener.onExpandedChange(!statusViewData.isExpanded(), getBindingAdapterPosition());
                     }
                     statusContent.setVisibility(statusViewData.isExpanded() ? View.GONE : View.VISIBLE);
                 });
@@ -619,7 +619,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
 
             if (statusViewData.isCollapsible() && (statusViewData.isExpanded() || !hasSpoiler)) {
                 contentCollapseButton.setOnClickListener(view -> {
-                    int position = getAdapterPosition();
+                    int position = getBindingAdapterPosition();
                     if (position != RecyclerView.NO_POSITION && notificationActionListener != null) {
                         notificationActionListener.onNotificationContentCollapsedChange(!statusViewData.isCollapsed(), position);
                     }

app/src/main/java/com/keylesspalace/tusky/adapter/PlaceholderViewHolder.java

@@ -41,7 +41,7 @@ public final class PlaceholderViewHolder extends RecyclerView.ViewHolder {
         loadMoreButton.setEnabled(true);
         loadMoreButton.setOnClickListener(v -> {
             loadMoreButton.setEnabled(false);
-            listener.onLoadMore(getAdapterPosition());
+            listener.onLoadMore(getBindingAdapterPosition());
         });
 
     }

app/src/main/java/com/keylesspalace/tusky/adapter/PollAdapter.kt

@@ -100,7 +100,7 @@ class PollAdapter: RecyclerView.Adapter<BindingHolder<ItemPollBinding>>() {
                 radioButton.isChecked = option.selected
                 radioButton.setOnClickListener {
                     pollOptions.forEachIndexed { index, pollOption ->
-                        pollOption.selected = index == holder.adapterPosition
+                        pollOption.selected = index == holder.bindingAdapterPosition
                         notifyItemChanged(index)
                     }
                 }
@@ -110,7 +110,7 @@ class PollAdapter: RecyclerView.Adapter<BindingHolder<ItemPollBinding>>() {
                 checkBox.text = EmojiCompat.get().process(emojifiedPollOptionText)
                 checkBox.isChecked = option.selected
                 checkBox.setOnCheckedChangeListener { _, isChecked ->
-                    pollOptions[holder.adapterPosition].selected = isChecked
+                    pollOptions[holder.bindingAdapterPosition].selected = isChecked
                 }
             }
         }

app/src/main/java/com/keylesspalace/tusky/adapter/SavedTootAdapter.java

@@ -113,9 +113,9 @@ public class SavedTootAdapter extends RecyclerView.Adapter {
 
                 suppr.setOnClickListener(v -> {
                     v.setEnabled(false);
-                    handler.delete(getAdapterPosition(), item);
+                    handler.delete(getBindingAdapterPosition(), item);
                 });
-                view.setOnClickListener(v -> handler.click(getAdapterPosition(), item));
+                view.setOnClickListener(v -> handler.click(getBindingAdapterPosition(), item));
             }
         }
     }

app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java

@@ -217,8 +217,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
             setContentWarningButtonText(expanded);
             contentWarningButton.setOnClickListener(view -> {
                 contentWarningDescription.invalidate();
-                if (getAdapterPosition() != RecyclerView.NO_POSITION) {
+                if (getBindingAdapterPosition() != RecyclerView.NO_POSITION) {
-                    listener.onExpandedChange(!expanded, getAdapterPosition());
+                    listener.onExpandedChange(!expanded, getBindingAdapterPosition());
                 }
                 setContentWarningButtonText(!expanded);
 
@@ -513,15 +513,15 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         sensitiveMediaWarning.setVisibility(showingContent ? View.GONE : View.VISIBLE);
         sensitiveMediaShow.setVisibility(showingContent ? View.VISIBLE : View.GONE);
         sensitiveMediaShow.setOnClickListener(v -> {
-            if (getAdapterPosition() != RecyclerView.NO_POSITION) {
+            if (getBindingAdapterPosition() != RecyclerView.NO_POSITION) {
-                listener.onContentHiddenChange(false, getAdapterPosition());
+                listener.onContentHiddenChange(false, getBindingAdapterPosition());
             }
             v.setVisibility(View.GONE);
             sensitiveMediaWarning.setVisibility(View.VISIBLE);
         });
         sensitiveMediaWarning.setOnClickListener(v -> {
-            if (getAdapterPosition() != RecyclerView.NO_POSITION) {
+            if (getBindingAdapterPosition() != RecyclerView.NO_POSITION) {
-                listener.onContentHiddenChange(true, getAdapterPosition());
+                listener.onContentHiddenChange(true, getBindingAdapterPosition());
             }
             v.setVisibility(View.GONE);
             sensitiveMediaShow.setVisibility(View.VISIBLE);
@@ -582,10 +582,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     private void setAttachmentClickListener(View view, StatusActionListener listener,
                                             int index, Attachment attachment, boolean animateTransition) {
         view.setOnClickListener(v -> {
-            int position = getAdapterPosition();
+            int position = getBindingAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
                 if (sensitiveMediaWarning.getVisibility() == View.VISIBLE) {
-                    listener.onContentHiddenChange(true, getAdapterPosition());
+                    listener.onContentHiddenChange(true, getBindingAdapterPosition());
                 } else {
                     listener.onViewMedia(position, index, animateTransition ? v : null);
                 }
@@ -627,7 +627,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         displayName.setOnClickListener(profileButtonClickListener);
 
         replyButton.setOnClickListener(v -> {
-            int position = getAdapterPosition();
+            int position = getBindingAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
                 listener.onReply(position);
             }
@@ -635,7 +635,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         if (reblogButton != null) {
             reblogButton.setEventListener((button, buttonState) -> {
                 // return true to play animaion
-                int position = getAdapterPosition();
+                int position = getBindingAdapterPosition();
                 if (position != RecyclerView.NO_POSITION) {
                     if (statusDisplayOptions.confirmReblogs()) {
                         showConfirmReblogDialog(listener, statusContent, buttonState, position);
@@ -651,7 +651,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         }
 
         favouriteButton.setEventListener((button, buttonState) -> {
-            int position = getAdapterPosition();
+            int position = getBindingAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
                 listener.onFavourite(!buttonState, position);
             }
@@ -659,7 +659,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         });
 
         bookmarkButton.setEventListener((button, buttonState) -> {
-            int position = getAdapterPosition();
+            int position = getBindingAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
                 listener.onBookmark(!buttonState, position);
             }
@@ -667,7 +667,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         });
 
         moreButton.setOnClickListener(v -> {
-            int position = getAdapterPosition();
+            int position = getBindingAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
                 listener.onMore(v, position);
             }
@@ -677,7 +677,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
          * just eat the clicks instead of deferring to the parent listener, but WILL respond to a
          * listener directly on the TextView, for whatever reason. */
         View.OnClickListener viewThreadListener = v -> {
-            int position = getAdapterPosition();
+            int position = getBindingAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
                 listener.onViewThread(position);
             }
@@ -926,7 +926,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         if (expired || poll.getVoted()) {
             // no voting possible
             View.OnClickListener viewThreadListener = v -> {
-                int position = getAdapterPosition();
+                int position = getBindingAdapterPosition();
                 if (position != RecyclerView.NO_POSITION) {
                     listener.onViewThread(position);
                 }
@@ -958,7 +958,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
 
             pollButton.setOnClickListener(v -> {
 
-                int position = getAdapterPosition();
+                int position = getBindingAdapterPosition();
 
                 if (position != RecyclerView.NO_POSITION) {
 

app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java

@@ -72,13 +72,13 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
         }
 
         reblogs.setOnClickListener(v -> {
-            int position = getAdapterPosition();
+            int position = getBindingAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
                 listener.onShowReblogs(position);
             }
         });
         favourites.setOnClickListener(v -> {
-            int position = getAdapterPosition();
+            int position = getBindingAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
                 listener.onShowFavs(position);
             }

app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java

@@ -67,7 +67,7 @@ public class StatusViewHolder extends StatusBaseViewHolder {
                 hideStatusInfo();
             } else {
                 setRebloggedByDisplayName(rebloggedByDisplayName, status, statusDisplayOptions);
-                statusInfo.setOnClickListener(v -> listener.onOpenReblog(getAdapterPosition()));
+                statusInfo.setOnClickListener(v -> listener.onOpenReblog(getBindingAdapterPosition()));
             }
 
         }
@@ -105,7 +105,7 @@ public class StatusViewHolder extends StatusBaseViewHolder {
         /* input filter for TextViews have to be set before text */
         if (status.isCollapsible() && (status.isExpanded() || TextUtils.isEmpty(status.getSpoilerText()))) {
             contentCollapseButton.setOnClickListener(view -> {
-                int position = getAdapterPosition();
+                int position = getBindingAdapterPosition();
                 if (position != RecyclerView.NO_POSITION)
                     listener.onContentCollapsedChange(!status.isCollapsed(), position);
             });

app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt

@@ -98,7 +98,7 @@ class TabAdapter(private var data: List<TabData>,
                 }
             }
             binding.removeButton.setOnClickListener {
-                listener.onTabRemoved(holder.adapterPosition)
+                listener.onTabRemoved(holder.bindingAdapterPosition)
             }
             binding.removeButton.isEnabled = removeButtonEnabled
             ThemeUtils.setDrawableTint(
@@ -131,7 +131,7 @@ class TabAdapter(private var data: List<TabData>,
                     } else {
                         chip.setChipIconResource(R.drawable.ic_cancel_24dp)
                         chip.setOnClickListener {
-                            listener.onChipClicked(tab, holder.adapterPosition, i)
+                            listener.onChipClicked(tab, holder.bindingAdapterPosition, i)
                         }
                     }
                 }
@@ -141,7 +141,7 @@ class TabAdapter(private var data: List<TabData>,
                 }
 
                 binding.actionChip.setOnClickListener {
-                    listener.onActionChipClicked(tab, holder.adapterPosition)
+                    listener.onActionChipClicked(tab, holder.bindingAdapterPosition)
                 }
 
             } else {

app/src/main/java/com/keylesspalace/tusky/components/compose/MediaPreviewAdapter.kt

@@ -103,7 +103,7 @@ class MediaPreviewAdapter(
             progressImageView.layoutParams = layoutParams
             progressImageView.scaleType = ImageView.ScaleType.CENTER_CROP
             progressImageView.setOnClickListener {
-                onMediaClick(adapterPosition, progressImageView)
+                onMediaClick(bindingAdapterPosition, progressImageView)
             }
         }
     }

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java

@@ -147,7 +147,7 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
         /* input filter for TextViews have to be set before text */
         if (collapsible && (expanded || TextUtils.isEmpty(spoilerText))) {
             contentCollapseButton.setOnClickListener(view -> {
-                int position = getAdapterPosition();
+                int position = getBindingAdapterPosition();
                 if (position != RecyclerView.NO_POSITION)
                     listener.onContentCollapsedChange(!collapsed, position);
             });

app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftsAdapter.kt

@@ -55,7 +55,7 @@ class DraftsAdapter(
 
         binding.draftMediaPreview.layoutManager = LinearLayoutManager(binding.root.context, RecyclerView.HORIZONTAL, false)
         binding.draftMediaPreview.adapter = DraftMediaAdapter {
-            getItem(viewHolder.adapterPosition)?.let { draft ->
+            getItem(viewHolder.bindingAdapterPosition)?.let { draft ->
                 listener.onOpenDraft(draft)
             }
         }

app/src/main/java/com/keylesspalace/tusky/components/instancemute/adapter/DomainMutesAdapter.kt

@@ -24,7 +24,7 @@ class DomainMutesAdapter(
 
         holder.binding.mutedDomain.text = instance
         holder.binding.mutedDomainUnmute.setOnClickListener {
-            actionListener.mute(false, instance, holder.adapterPosition)
+            actionListener.mute(false, instance, holder.bindingAdapterPosition)
         }
     }
 

app/src/main/java/com/keylesspalace/tusky/components/report/adapter/StatusViewHolder.kt

@@ -173,5 +173,5 @@ class StatusViewHolder(
         }
     }
 
-    private fun status() = getStatusForPosition(adapterPosition)
+    private fun status() = getStatusForPosition(bindingAdapterPosition)
 }

app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.kt

@@ -21,6 +21,7 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -31,6 +32,7 @@ import com.keylesspalace.tusky.AccountListActivity.Type
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.adapter.*
+import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.databinding.FragmentAccountListBinding
 import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.entity.Account
@@ -56,6 +58,8 @@ class AccountListFragment : Fragment(R.layout.fragment_account_list), AccountAct
 
     @Inject
     lateinit var api: MastodonApi
+    @Inject
+    lateinit var accountManager: AccountManager
 
     private val binding by viewBinding(FragmentAccountListBinding::bind)
 
@@ -90,10 +94,17 @@ class AccountListFragment : Fragment(R.layout.fragment_account_list), AccountAct
         adapter = when (type) {
             Type.BLOCKS -> BlocksAdapter(this, animateAvatar, animateEmojis)
             Type.MUTES -> MutesAdapter(this, animateAvatar, animateEmojis)
-            Type.FOLLOW_REQUESTS -> FollowRequestsAdapter(this, animateAvatar, animateEmojis)
+            Type.FOLLOW_REQUESTS -> {
+                val headerAdapter = FollowRequestsHeaderAdapter(accountManager.activeAccount!!.domain, arguments?.get(ARG_ACCOUNT_LOCKED) == true)
+                val followRequestsAdapter = FollowRequestsAdapter(this, animateAvatar, animateEmojis)
+                binding.recyclerView.adapter = ConcatAdapter(headerAdapter, followRequestsAdapter)
+                followRequestsAdapter
+            }
             else -> FollowAdapter(this, animateAvatar, animateEmojis)
         }
+        if (binding.recyclerView.adapter == null) {
             binding.recyclerView.adapter = adapter
+        }
 
         scrollListener = object : EndlessOnScrollListener(layoutManager) {
             override fun onLoadMore(totalItemsCount: Int, view: RecyclerView) {
@@ -361,12 +372,14 @@ class AccountListFragment : Fragment(R.layout.fragment_account_list), AccountAct
         private const val TAG = "AccountList" // logging tag
         private const val ARG_TYPE = "type"
         private const val ARG_ID = "id"
+        private const val ARG_ACCOUNT_LOCKED = "acc_locked"
 
-        fun newInstance(type: Type, id: String? = null): AccountListFragment {
+        fun newInstance(type: Type, id: String? = null, accountLocked: Boolean = false): AccountListFragment {
             return AccountListFragment().apply {
                 arguments = Bundle(2).apply {
                     putSerializable(ARG_TYPE, type)
                     putString(ARG_ID, id)
+                    putBoolean(ARG_ACCOUNT_LOCKED, accountLocked)
                 }
             }
         }

app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt

@@ -320,7 +320,7 @@ class AccountMediaFragment : Fragment(R.layout.fragment_timeline), RefreshableFr
 
             // saving some allocations
             override fun onClick(v: View?) {
-                viewMedia(items, adapterPosition, imageView)
+                viewMedia(items, bindingAdapterPosition, imageView)
             }
         }
     }

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:hyphenationFrequency="normal"
+    android:lineSpacingMultiplier="1.1"
+    android:paddingStart="16dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="8dp"
+    tools:text="@string/follow_requests_info" />

app/src/main/res/values/strings.xml

@@ -622,6 +622,9 @@
     <string name="draft_deleted">Draft deleted</string>
     <string name="drafts_toot_reply_removed">The Toot you drafted a reply to has been removed</string>
 
+    <string name="follow_requests_info">Even though your account is not locked, the %1$s staff thought you might want to review follow requests from these accounts manually.</string>
+
     <string name="action_subscribe_account">Subscribe</string>
     <string name="action_unsubscribe_account">Unsubscribe</string>
+
 </resources>