From: Peter Henn <Peter.Henn@web.de>
Date: Tue, 8 Dec 2015 00:13:26 +0000 (+0000)
Subject: Merge tag 'oc-android-1.9' into sdcard-save
X-Git-Tag: sd-android-1.9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/refs/heads/sdcard-save?hp=106a2324e113d997db71f00a63ecda3ad828f098

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

Version 1.9: Release with expanded sharing
Resolved conflicts in:
src/com/owncloud/android/utils/FileStorageUtils.java
---

diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 1740ca58..10d17090 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -53,11 +53,40 @@ public class FileStorageUtils {
     public static Integer mSortOrder = SORT_NAME;
     public static Boolean mSortAscending = true;
 
-    
+    //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) {
@@ -65,14 +94,17 @@ public class FileStorageUtils {
     }
 
     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();
 
@@ -132,7 +164,7 @@ public class FileStorageUtils {
         file.setRemoteId(remote.getRemoteId());
         return file;
     }
-    
+
     /**
      * Creates and populates a new {@link RemoteFile} object with the data read from an {@link OCFile}.
      * 
@@ -150,9 +182,9 @@ public class FileStorageUtils {
         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){
@@ -162,14 +194,14 @@ public class FileStorageUtils {
         case 1:
             files = FileStorageUtils.sortByDate(files);
             break;
-        case 2: 
+        case 2:
            // mFiles = FileStorageUtils.sortBySize(mSortAscending);
             break;
         }
-       
+
         return files;
     }
-    
+
     /**
      * Sorts list by Date
      * @param files
@@ -181,7 +213,7 @@ public class FileStorageUtils {
         } else {
             val = -1;
         }
-        
+
         Collections.sort(files, new Comparator<OCFile>() {
             public int compare(OCFile o1, OCFile o2) {
                 if (o1.isFolder() && o2.isFolder()) {
@@ -200,7 +232,7 @@ public class FileStorageUtils {
                 }
             }
         });
-        
+
         return files;
     }
 
@@ -215,7 +247,7 @@ public class FileStorageUtils {
 //        } else {
 //            val = -1;
 //        }
-//        
+//
 //        Collections.sort(files, new Comparator<OCFile>() {
 //            public int compare(OCFile o1, OCFile o2) {
 //                if (o1.isFolder() && o2.isFolder()) {
@@ -234,7 +266,7 @@ public class FileStorageUtils {
 //                }
 //            }
 //        });
-//        
+//
 //        return files;
 //    }
 
@@ -262,10 +294,10 @@ public class FileStorageUtils {
                 return val * new AlphanumComparator().compare(o1, o2);
             }
         });
-        
+
         return files;
     }
-    
+
     /**
      * Local Folder size
      * @param dir File