wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1115500 - [DeviceStorage] Return the first storage if preferred storage is not presented in GetDefaultStorageName. r=dyhlands

Browse Source
This commit is contained in:
Alphan Chen 2015-03-09 14:35:06 +08:00
parent 211ae977d0
commit 27e66c36e7
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dom/devicestorage/nsDeviceStorage.cpp
View File

@ -74,6 +74,8 @@
#define DEVICESTORAGE_PROPERTIES \
"chrome://global/content/devicestorage.properties"
#define DEFAULT_THREAD_TIMEOUT_MS 30000
#define PREF_STORAGE_WRITABLE_NAME \
"device.storage.writable.name"
using namespace mozilla;
using namespace mozilla::dom;
@ -3625,20 +3627,29 @@ nsDOMDeviceStorage::GetDefaultStorageName(const nsAString& aStorageType,
nsAString& aStorageName)
{
// See if the preferred volume is available.
nsRefPtr<nsDOMDeviceStorage> ds;
nsAdoptingString prefStorageName =
mozilla::Preferences::GetString("device.storage.writable.name");
mozilla::Preferences::GetString(PREF_STORAGE_WRITABLE_NAME);
if (prefStorageName) {
aStorageName = prefStorageName;
return;
nsString status;
nsRefPtr<DeviceStorageFile> dsf = new DeviceStorageFile(aStorageType,
prefStorageName);
dsf->GetStorageStatus(status);
if (!status.EqualsLiteral("NoMedia")) {
aStorageName = prefStorageName;
return;
}
}
// No preferred storage, we'll use the first one (which should be sdcard).
// If there is no preferred storage or preferred storage is not presented,
// we'll use the first one (which should be sdcard).
VolumeNameArray volNames;
GetOrderedVolumeNames(volNames);
if (volNames.Length() > 0) {
aStorageName = volNames[0];
// overwrite the value of "device.storage.writable.name"
mozilla::Preferences::SetString(PREF_STORAGE_WRITABLE_NAME, aStorageName);
return;
}