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

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 --cc 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
@@@ -49,45 -49,16 +49,44 @@@ public class FileStorageUtils 
      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) {