From: tobiasKaminsky <tobias@kaminsky.me>
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=-c

Merge remote-tracking branch 'upstream/develop' into
bugfixMultipleSelect

Conflicts:
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
---

ec19a11a385ff21d3e85a94e618d48d8be9ef20d
diff --combined project.properties
index c9e58408,28edd993..3c67d777
--- a/project.properties
+++ b/project.properties
@@@ -10,3 -10,4 +10,5 @@@
  # Project target.
  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 --combined src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index 9eb7d1da,a9b6ad2c..c9408b1e
--- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@@ -18,12 -18,7 +18,8 @@@
  package com.owncloud.android.ui.fragment;
  
  import java.io.File;
 +import java.util.ArrayList;
  
- import com.owncloud.android.Log_OC;
- import com.owncloud.android.R;
- import com.owncloud.android.ui.adapter.LocalFileListAdapter;
- 
  import android.app.Activity;
  import android.os.Bundle;
  import android.os.Environment;
@@@ -35,6 -30,10 +31,10 @@@ import android.widget.AdapterView
  import android.widget.ImageView;
  import android.widget.ListView;
  
+ import com.owncloud.android.R;
+ import com.owncloud.android.lib.common.utils.Log_OC;
+ import com.owncloud.android.ui.adapter.LocalFileListAdapter;
+ 
  
  /**
   * A Fragment that lists all files and folders in a given LOCAL path.
@@@ -77,6 -76,8 +77,8 @@@ public class LocalFileListFragment exte
          Log_OC.i(TAG, "onCreateView() start");
          View v = super.onCreateView(inflater, container, savedInstanceState);
          getListView().setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+         disableSwipe(); // Disable pull refresh
+         setMessageForEmptyList(getString(R.string.local_file_list_empty));
          Log_OC.i(TAG, "onCreateView() end");
          return v;
      }    
@@@ -89,7 -90,7 +91,7 @@@
      public void onActivityCreated(Bundle savedInstanceState) {
          Log_OC.i(TAG, "onActivityCreated() start");
          
-         super.onCreate(savedInstanceState);
+         super.onActivityCreated(savedInstanceState);
          mAdapter = new LocalFileListAdapter(mContainerActivity.getInitialDirectory(), getActivity());
          setListAdapter(mAdapter);
          
@@@ -110,6 -111,8 +112,8 @@@
                  listDirectory(file);
                  // notify the click to container Activity
                  mContainerActivity.onDirectoryClick(file);
+                 // save index and top position
+                 saveIndexAndTopPosition(position);
              
              } else {    /// Click on a file
                  ImageView checkBoxV = (ImageView) v.findViewById(R.id.custom_checkbox);
@@@ -139,6 -142,9 +143,9 @@@
              parentDir = mDirectory.getParentFile();  // can be null
          }
          listDirectory(parentDir);
+ 
+         // restore index and top position
+         restoreIndexAndTopPosition();
      }
  
      
@@@ -203,18 -209,16 +210,18 @@@
       * @return      File paths to the files checked by the user.
       */
      public String[] getCheckedFilePaths() {
 -        String [] result = null;
 +        ArrayList<String> result = new ArrayList<String>();
          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<positions.size(); i++) {
 -                result[i] = ((File) mList.getItemAtPosition(positions.keyAt(i))).getAbsolutePath();
 +            for (int i = 0; i < positions.size(); i++) {
 +                if (positions.get(positions.keyAt(i)) == true) {
 +                    result.add(((File) mList.getItemAtPosition(positions.keyAt(i))).getAbsolutePath());
 +                }
              }
 +
 +            Log_OC.d(TAG, "Returning " + result.size() + " selected files");
          }
 -        return result;
 +        return result.toArray(new String[result.size()]);
      }