Browse Source

Patch preventing crash during move of multiple files

David A. Velasco 9 năm trước cách đây
mục cha
commit
7631bc24d3

+ 6 - 1
src/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -53,6 +53,7 @@ import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
+import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.utils.DisplayUtils;
@@ -503,9 +504,13 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     public ArrayList<OCFile> getCheckedItems() {
         ArrayList<OCFile> files = new ArrayList<OCFile>();
 
+        OCFile checkedFile = null;
         for (Map.Entry<Integer, Boolean> entry : mSelection.entrySet()){
             if (entry.getValue()){
-                files.add((OCFile) getItem(entry.getKey()));
+                checkedFile = (OCFile) getItem(entry.getKey());
+                if (checkedFile != null) {
+                    files.add((OCFile) getItem(entry.getKey()));
+                }
             }
         }
         return files;

+ 0 - 1
src/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -345,7 +345,6 @@ public class OCFileListFragment extends ExtendedListFragment {
     }
 
     private void registerLongClickListener() {
-        AbsListView listView = getListView();
         setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
         setMultiChoiceModeListener(new AbsListView.MultiChoiceModeListener() {