From: tobiasKaminsky Date: Fri, 24 Oct 2014 16:44:04 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into X-Git-Tag: oc-android-1.7.0_signed~126^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ec19a11a385ff21d3e85a94e618d48d8be9ef20d?hp=8d3a956c974661aa1a58f9083ae0af7c3e1a0ca3 Merge remote-tracking branch 'upstream/develop' into bugfixMultipleSelect Conflicts: src/com/owncloud/android/ui/fragment/LocalFileListFragment.java --- diff --git a/project.properties b/project.properties index 28edd993..3c67d777 100644 --- a/project.properties +++ b/project.properties @@ -11,3 +11,4 @@ target=android-19 android.library.reference.1=actionbarsherlock/library android.library.reference.2=owncloud-android-library +android.library.reference.3=../android-library/android-library diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java index a9b6ad2c..c9408b1e 100644 --- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java @@ -18,6 +18,7 @@ package com.owncloud.android.ui.fragment; import java.io.File; +import java.util.ArrayList; import android.app.Activity; import android.os.Bundle; @@ -209,16 +210,18 @@ public class LocalFileListFragment extends ExtendedListFragment { * @return File paths to the files checked by the user. */ public String[] getCheckedFilePaths() { - String [] result = null; + ArrayList result = new ArrayList(); SparseBooleanArray positions = mList.getCheckedItemPositions(); if (positions.size() > 0) { - Log_OC.d(TAG, "Returning " + positions.size() + " selected files"); - result = new String[positions.size()]; - for (int i=0; i