From: Peter Henn 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/70e79071435bc8d7a53f36eb4202c4ec05dd2075?hp=-c 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 --- 70e79071435bc8d7a53f36eb4202c4ec05dd2075 diff --combined src/com/owncloud/android/utils/FileStorageUtils.java index 808f2216,1740ca58..10d17090 --- a/src/com/owncloud/android/utils/FileStorageUtils.java +++ b/src/com/owncloud/android/utils/FileStorageUtils.java @@@ -32,6 -32,7 +32,7 @@@ import com.owncloud.android.R import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.lib.resources.files.RemoteFile; + import android.accounts.Account; import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; @@@ -52,41 -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) { @@@ -94,17 -65,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(); @@@ -151,7 -119,7 +151,7 @@@ * Creates and populates a new {@link OCFile} object with the data read from the server. * * @param remote remote file read from the server (remote file or folder). - * @return New OCFile instance representing the remote resource described by we. + * @return New OCFile instance representing the remote resource described by remote. */ public static OCFile fillOCFile(RemoteFile remote) { OCFile file = new OCFile(remote.getRemotePath()); @@@ -164,7 -132,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}. * @@@ -182,9 -150,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 sortFolder(Vector files){ switch (mSortOrder){ @@@ -194,14 -162,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 @@@ -213,7 -181,7 +213,7 @@@ } else { val = -1; } - + Collections.sort(files, new Comparator() { public int compare(OCFile o1, OCFile o2) { if (o1.isFolder() && o2.isFolder()) { @@@ -232,7 -200,7 +232,7 @@@ } } }); - + return files; } @@@ -247,7 -215,7 +247,7 @@@ // } else { // val = -1; // } -// +// // Collections.sort(files, new Comparator() { // public int compare(OCFile o1, OCFile o2) { // if (o1.isFolder() && o2.isFolder()) { @@@ -266,7 -234,7 +266,7 @@@ // } // } // }); -// +// // return files; // } @@@ -285,7 -253,7 +285,7 @@@ Collections.sort(files, new Comparator() { public int compare(OCFile o1, OCFile o2) { if (o1.isFolder() && o2.isFolder()) { - return val * o1.getRemotePath().toLowerCase().compareTo(o2.getRemotePath().toLowerCase()); + return val * new AlphanumComparator().compare(o1, o2); } else if (o1.isFolder()) { return -1; } else if (o2.isFolder()) { @@@ -294,10 -262,10 +294,10 @@@ return val * new AlphanumComparator().compare(o1, o2); } }); - + return files; } - + /** * Local Folder size * @param dir File @@@ -333,5 -301,33 +333,33 @@@ String result = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension.toLowerCase()); return (result != null) ? result : ""; } - + + /** + * Scans the default location for saving local copies of files searching for + * a 'lost' file with the same full name as the {@link OCFile} received as + * parameter. + * + * This method helps to keep linked local copies of the files when the app is uninstalled, and then + * reinstalled in the device. OR after the cache of the app was deleted in system settings. + * + * The method is assuming that all the local changes in the file where synchronized in the past. This is dangerous, + * but assuming the contrary could lead to massive unnecessary synchronizations of downloaded file after deleting + * the app cache. + * + * This should be changed in the near future to avoid any chance of data loss, but we need to add some options + * to limit hard automatic synchronizations to wifi, unless the user wants otherwise. + * + * @param file File to associate a possible 'lost' local file. + * @param account Account holding file. + */ + public static void searchForLocalFileInDefaultPath(OCFile file, Account account) { + if (file.getStoragePath() == null && !file.isFolder()) { + File f = new File(FileStorageUtils.getDefaultSavePathFor(account.name, file)); + if (f.exists()) { + file.setStoragePath(f.getAbsolutePath()); + file.setLastSyncDateForData(f.lastModified()); + } + } + } + }