From: Peter Henn <Peter.Henn@web.de>
Date: Sat, 3 Oct 2015 10:03:37 +0000 (+0000)
Subject: Merge tag 'oc-android-1.8' into sdcard-save
X-Git-Tag: sd-android-1.8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bbfcb04a9947d0076dff20bb57d2944b85d6dc65?hp=-c

Merge tag 'oc-android-1.8' into sdcard-save

Version 1.8: Includes Material Design
Resolved conflicts in:
src/com/owncloud/android/utils/FileStorageUtils.java
---

bbfcb04a9947d0076dff20bb57d2944b85d6dc65
diff --combined src/com/owncloud/android/utils/FileStorageUtils.java
index d7029f17,d6ebdbd3..808f2216
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@@ -46,48 -46,19 +46,47 @@@ import android.webkit.MimeTypeMap
   * Static methods to help in access to local file system.
   */
  public class FileStorageUtils {
-     public static Integer mSortOrder;
-     public static Boolean mSortAscending;
      public static final Integer SORT_NAME = 0;
      public static final Integer SORT_DATE = 1;
      public static final Integer SORT_SIZE = 2;
+     public static Integer mSortOrder = SORT_NAME;
+     public static Boolean mSortAscending = true;
  
 -    
 -    //private static final String LOG_TAG = "FileStorageUtils";
 +
 +    //private static final String TAG = FileStorageUtils.class.getSimpleName();
 +
 +    @SuppressLint("NewApi")
 +    private static final File getBaseStorePath() {
 +        File baseStoragePath = Environment.getExternalStorageDirectory();
 +        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
 +            File[] dirs = MainApp.getAppContext().getExternalFilesDirs(null);
 +            if (dirs.length > 1) {
 +                baseStoragePath = dirs[1];
 +            }
 +        }
 +        return baseStoragePath;
 +    }
 +
 +    @SuppressLint("NewApi")
 +    private static final String getBaseStorePathString() {
 +        File baseStoragePath = Environment.getExternalStorageDirectory();
 +        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
 +            File[] dirs = MainApp.getAppContext().getExternalFilesDirs(null);
 +            if (dirs.length > 1) {
 +                baseStoragePath = dirs[1];
 +            }
 +            return baseStoragePath.getAbsolutePath();
 +        } else {
 +            return baseStoragePath.getAbsolutePath() + "/" + MainApp.getDataFolder();
 +        }
 +    }
  
- 
      public static final String getSavePath(String accountName) {
 -        File sdCard = Environment.getExternalStorageDirectory();
 -        return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");
 +        //File sdCard = Environment.getExternalStorageDirectory();
 +        //return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");
          // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B
 +        //return getBaseStorePath().getAbsolutePath()  + "/" + Uri.encode(accountName, "@");
 +        return getBaseStorePathString()  + "/" + Uri.encode(accountName, "@");
      }
  
      public static final String getDefaultSavePathFor(String accountName, OCFile file) {
@@@ -95,17 -66,14 +94,17 @@@
      }
  
      public static final String getTemporalPath(String accountName) {
 -        File sdCard = Environment.getExternalStorageDirectory();
 -        return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/tmp/" + Uri.encode(accountName, "@");
 +        //File sdCard = Environment.getExternalStorageDirectory();
 +        //return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/tmp/" + Uri.encode(accountName, "@");
              // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B
 +        //return getBaseStorePath().getAbsolutePath() + "/tmp/" + Uri.encode(accountName, "@");
 +        return getBaseStorePathString() + "/tmp/" + Uri.encode(accountName, "@");        
      }
  
      @SuppressLint("NewApi")
      public static final long getUsableSpace(String accountName) {
 -        File savePath = Environment.getExternalStorageDirectory();
 +        //File savePath = Environment.getExternalStorageDirectory();
 +        File savePath = getBaseStorePath();
          if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD) {
              return savePath.getUsableSpace();
  
@@@ -165,7 -133,7 +164,7 @@@
          file.setRemoteId(remote.getRemoteId());
          return file;
      }
 -    
 +
      /**
       * Creates and populates a new {@link RemoteFile} object with the data read from an {@link OCFile}.
       * 
@@@ -183,9 -151,9 +182,9 @@@
          file.setRemoteId(ocFile.getRemoteId());
          return file;
      }
 -    
 +
      /**
 -     * Sorts all filenames, regarding last user decision 
 +     * Sorts all filenames, regarding last user decision
       */
      public static Vector<OCFile> sortFolder(Vector<OCFile> files){
          switch (mSortOrder){
@@@ -195,14 -163,14 +194,14 @@@
          case 1:
              files = FileStorageUtils.sortByDate(files);
              break;
 -        case 2: 
 +        case 2:
             // mFiles = FileStorageUtils.sortBySize(mSortAscending);
              break;
          }
 -       
 +
          return files;
      }
 -    
 +
      /**
       * Sorts list by Date
       * @param files
@@@ -214,7 -182,7 +213,7 @@@
          } else {
              val = -1;
          }
 -        
 +
          Collections.sort(files, new Comparator<OCFile>() {
              public int compare(OCFile o1, OCFile o2) {
                  if (o1.isFolder() && o2.isFolder()) {
@@@ -233,7 -201,7 +232,7 @@@
                  }
              }
          });
 -        
 +
          return files;
      }
  
@@@ -248,7 -216,7 +247,7 @@@
  //        } else {
  //            val = -1;
  //        }
 -//        
 +//
  //        Collections.sort(files, new Comparator<OCFile>() {
  //            public int compare(OCFile o1, OCFile o2) {
  //                if (o1.isFolder() && o2.isFolder()) {
@@@ -267,7 -235,7 +266,7 @@@
  //                }
  //            }
  //        });
 -//        
 +//
  //        return files;
  //    }
  
@@@ -295,10 -263,10 +294,10 @@@
                  return val * new AlphanumComparator().compare(o1, o2);
              }
          });
 -        
 +
          return files;
      }
 -    
 +
      /**
       * Local Folder size
       * @param dir File