mirror of
https://github.com/nextcloud/android.git
synced 2024-11-29 10:49:04 +03:00
Fix exception on computing available space
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
parent
9710a8a863
commit
3108759dac
3 changed files with 64 additions and 6 deletions
|
@ -0,0 +1,48 @@
|
|||
/*
|
||||
*
|
||||
* Nextcloud Android client application
|
||||
*
|
||||
* @author Tobias Kaminsky
|
||||
* Copyright (C) 2020 Tobias Kaminsky
|
||||
* Copyright (C) 2020 Nextcloud GmbH
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.owncloud.android.ui.helpers
|
||||
|
||||
import com.owncloud.android.MainApp
|
||||
import junit.framework.Assert.assertEquals
|
||||
import junit.framework.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
|
||||
class FileOperationsHelperIT {
|
||||
|
||||
@Test
|
||||
fun testNull() {
|
||||
MainApp.setStoragePath(null)
|
||||
assertEquals(-1L, FileOperationsHelper.getAvailableSpaceOnDevice())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testNonExistingPath() {
|
||||
MainApp.setStoragePath("/123/123")
|
||||
assertEquals(-1L, FileOperationsHelper.getAvailableSpaceOnDevice())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testExistingPath() {
|
||||
MainApp.setStoragePath("/sdcard/")
|
||||
assertTrue(FileOperationsHelper.getAvailableSpaceOnDevice() > 0L)
|
||||
}
|
||||
}
|
|
@ -1710,11 +1710,14 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
|||
|
||||
private void syncAndCheckFiles(Collection<OCFile> files) {
|
||||
for (OCFile file : files) {
|
||||
// Get the remaining space on device (after file download)
|
||||
// Get the remaining space on device
|
||||
long availableSpaceOnDevice = FileOperationsHelper.getAvailableSpaceOnDevice();
|
||||
|
||||
// Determine if space is enough to download the file
|
||||
boolean isSpaceEnough = availableSpaceOnDevice > file.getFileLength();
|
||||
// Determine if space is enough to download the file, -1 available space if there in error while computing
|
||||
boolean isSpaceEnough = true;
|
||||
if (availableSpaceOnDevice >= 0) {
|
||||
isSpaceEnough = availableSpaceOnDevice > file.getFileLength();
|
||||
}
|
||||
|
||||
if (isSpaceEnough) {
|
||||
mContainerActivity.getFileOperationsHelper().syncFile(file);
|
||||
|
|
|
@ -1038,10 +1038,18 @@ public class FileOperationsHelper {
|
|||
return new SimpleDateFormat("yyyy-MM-dd_HHmmss", Locale.US).format(new Date()) + ".jpg";
|
||||
}
|
||||
|
||||
/**
|
||||
* @return -1 if no space could computed, otherwise available space in bytes
|
||||
*/
|
||||
public static Long getAvailableSpaceOnDevice() {
|
||||
StatFs stat = new StatFs(MainApp.getStoragePath());
|
||||
long availableBytesOnDevice;
|
||||
StatFs stat;
|
||||
try {
|
||||
stat = new StatFs(MainApp.getStoragePath());
|
||||
} catch (NullPointerException | IllegalArgumentException e) {
|
||||
return -1L;
|
||||
}
|
||||
|
||||
long availableBytesOnDevice;
|
||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) {
|
||||
availableBytesOnDevice = stat.getBlockSizeLong() * stat.getAvailableBlocksLong();
|
||||
} else {
|
||||
|
@ -1051,5 +1059,4 @@ public class FileOperationsHelper {
|
|||
return availableBytesOnDevice;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue