commit 894d182883bd1af8be5683a80b090d17a3abc207
author Louis Pullen-Freilich <lpf@google.com> Wed Jan 30 17:44:18 2019 +0000
committer Louis Pullen-Freilich <lpf@google.com> Thu Jan 31 18:42:50 2019 +0000
tree 50d7f27bbf0ddbf97e4431e384e4df51f278fc2f
parent 466abdcd7f9cf7d0e43d7802171f6fffb3bdd37b

Fixes ContextMenuListener not being removed if copying is not enabled

This caused issues when reusing viewholders that previously had a
ContextMenuListener set.

Bug: b/123572344
Test: Manually verified
Change-Id: I8577da741f913f4ac97f6b1fdc272326c6e2dd6e

preference/src/main/java/androidx/preference/Preference.java

diff --git a/preference/src/main/java/androidx/preference/Preference.java b/preference/src/main/java/androidx/preference/Preference.java
index cfa8b4e..930508b 100644
--- a/preference/src/main/java/androidx/preference/Preference.java
+++ b/preference/src/main/java/androidx/preference/Preference.java
@@ -572,12 +572,10 @@
         holder.setDividerAllowedAbove(mAllowDividerAbove);
         holder.setDividerAllowedBelow(mAllowDividerBelow);
 
-        if (isCopyingEnabled()) {
-            if (mOnCopyListener == null) {
-                mOnCopyListener = new OnPreferenceCopyListener(this);
-            }
-            holder.itemView.setOnCreateContextMenuListener(mOnCopyListener);
+        if (isCopyingEnabled() && mOnCopyListener == null) {
+            mOnCopyListener = new OnPreferenceCopyListener(this);
         }
+        holder.itemView.setOnCreateContextMenuListener(isCopyingEnabled() ? mOnCopyListener : null);
     }
 
     /**