Эх сурвалжийг харах

Merge pull request #9545 from nextcloud/fix/autoupload-check-crash

UploadFilesActivity: don't attempt to check selectAll if selectAll is not visible in menu
Álvaro Brey 3 жил өмнө
parent
commit
587b371e76

+ 9 - 7
src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -462,14 +462,16 @@ public class UploadFilesActivity extends DrawerActivity implements LocalFileList
     }
 
     private void setSelectAllMenuItem(MenuItem selectAll, boolean checked) {
-        selectAll.setChecked(checked);
-        if (checked) {
-            selectAll.setIcon(R.drawable.ic_select_none);
-        } else {
-            selectAll.setIcon(
-                ThemeDrawableUtils.tintDrawable(R.drawable.ic_select_all, ThemeColorUtils.primaryColor(this)));
+        if (selectAll != null) {
+            selectAll.setChecked(checked);
+            if (checked) {
+                selectAll.setIcon(R.drawable.ic_select_none);
+            } else {
+                selectAll.setIcon(
+                    ThemeDrawableUtils.tintDrawable(R.drawable.ic_select_all, ThemeColorUtils.primaryColor(this)));
+            }
+            updateUploadButtonActive();
         }
-        updateUploadButtonActive();
     }
 
     @Override