projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update FileStorageUtils.java
[pub/Android/ownCloud.git]
/
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
58dda0d
..
01176ac
100644
(file)
--- a/
src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/
src/com/owncloud/android/utils/FileStorageUtils.java
@@
-73,7
+73,9
@@
public class FileStorageUtils {
}
public static String getInstantUploadFilePath(Context context, String fileName) {
}
public static String getInstantUploadFilePath(Context context, String fileName) {
- String uploadPath = context.getString(R.string.instant_upload_path);
+ SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
+ String uploadPathdef = context.getString(R.string.instant_upload_path);
+ String uploadPath = pref.getString("instant_upload_path", uploadPathdef);
String value = uploadPath + OCFile.PATH_SEPARATOR + (fileName == null ? "" : fileName);
return value;
}
String value = uploadPath + OCFile.PATH_SEPARATOR + (fileName == null ? "" : fileName);
return value;
}
@@
-120,4
+122,4
@@
public class FileStorageUtils {
return file;
}
return file;
}
-}
\ No newline at end of file
+}