X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b3d9e3416bb4fe4c497d369e98a92c0d2ac45036..bb5f00fcb4a9102cf64aa1282ba4a1db78875708:/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 d0f457eb..68f6e278 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -53,11 +53,27 @@ public class FileStorageUtils {
         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, "@");
         // 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 getBaseStorePath().getAbsolutePath()  + "/" + Uri.encode(accountName, "@");
+        return getBaseStorePathString()  + "/" + Uri.encode(accountName, "@");
     }
 
     public static final String getDefaultSavePathFor(String accountName, OCFile file) {
@@ -68,7 +84,8 @@ public class FileStorageUtils {
         //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 getBaseStorePath().getAbsolutePath() + "/tmp/" + Uri.encode(accountName, "@");
+        return getBaseStorePathString() + "/tmp/" + Uri.encode(accountName, "@");        
     }
 
     @SuppressLint("NewApi")