fix merge

drstranges · Jul 24, 2017 · c3d21f5 · c3d21f5
1 parent f0a7c0e
commit c3d21f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/actionhandler/build.gradle b/actionhandler/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 ext {
     libraryVersionMajor = 1
     libraryVersionMinor = 1
-    libraryVersionRevision = 3
+    libraryVersionRevision = 4
 
     libraryVersion = libraryVersionMajor + '.' + libraryVersionMinor + '.' + libraryVersionRevision
 

diff --git a/actionhandler/src/main/java/com/drextended/actionhandler/action/CompositeAction.java b/actionhandler/src/main/java/com/drextended/actionhandler/action/CompositeAction.java
@@ -664,16 +664,16 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 //noinspection unchecked
                 Drawable icon = item.iconProvider.getIconDrawable(context, mModel);
                 if (icon != null) {
-                    imageView.setVisibility(View.VISIBLE);
-                    imageView.setImageDrawable(icon);
+                    viewHolder.imageView.setVisibility(View.VISIBLE);
+                    viewHolder.imageView.setImageDrawable(icon);
                     if (mShowNonAcceptedActions) {
                         viewHolder.imageView.setAlpha(modelAccepted ? 1.0f : 0.3f);
                     }
                 } else {
-                    imageView.setVisibility(mHasIcons ? View.INVISIBLE : View.GONE);
+                    viewHolder.imageView.setVisibility(mHasIcons ? View.INVISIBLE : View.GONE);
                 }
             } else {
-                imageView.setVisibility(mHasIcons ? View.INVISIBLE : View.GONE);
+                viewHolder.imageView.setVisibility(mHasIcons ? View.INVISIBLE : View.GONE);
             }
 
             return convertView;