mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Clear temp directory for cancelling all uploads

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-04-11 16:55:35 +02:00 committed by Alper Öztürk
parent 39e9916732
commit 7470fef2d6
3 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file

@ -56,7 +56,10 @@ import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.MimeType; import com.owncloud.android.utils.MimeType;
import com.owncloud.android.utils.MimeTypeUtil; import com.owncloud.android.utils.MimeTypeUtil;
import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -338,6 +341,43 @@ public class FileDataStorageManager {
return ocFile; return ocFile;
} }
private static final String tempEncryptedFolderPath = "temp_encrypted_folder";
public static void clearTempEncryptedFolder(Context context) {
File tempEncryptedFolder = getTempEncryptedFolder(context);
if (!tempEncryptedFolder.exists()) {
Log_OC.d(TAG,"tempEncryptedFolder not exists");
return;
}
try {
FileUtils.cleanDirectory(tempEncryptedFolder);
Log_OC.d(TAG,"tempEncryptedFolder cleared");
} catch (IOException exception) {
Log_OC.d(TAG,"Error caught at clearTempEncryptedFolder: " + exception);
}
}
public static File getTempEncryptedFolder(Context context) {
String dirPath = context.getFilesDir().getAbsolutePath() + File.separator + tempEncryptedFolderPath;
return new File(dirPath);
}
public static File createTempEncryptedFolder(Context context) {
File tempEncryptedFolder = getTempEncryptedFolder(context);
if (!tempEncryptedFolder.exists()) {
boolean isTempEncryptedFolderCreated = tempEncryptedFolder.mkdirs();
Log_OC.d(TAG, "tempEncryptedFolder created" + isTempEncryptedFolderCreated);
} else {
Log_OC.d(TAG, "tempEncryptedFolder already exists");
}
return tempEncryptedFolder;
}
public void saveNewFile(OCFile newFile) { public void saveNewFile(OCFile newFile) {
String remoteParentPath = new File(newFile.getRemotePath()).getParent(); String remoteParentPath = new File(newFile.getRemotePath()).getParent();
remoteParentPath = remoteParentPath.endsWith(OCFile.PATH_SEPARATOR) ? remoteParentPath = remoteParentPath.endsWith(OCFile.PATH_SEPARATOR) ?

4
app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
View file

@ -54,6 +54,8 @@ import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.MimeTypeUtil; import com.owncloud.android.utils.MimeTypeUtil;
import com.owncloud.android.utils.theme.ViewThemeUtils; import com.owncloud.android.utils.theme.ViewThemeUtils;
import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.Optional; import java.util.Optional;
@ -169,6 +171,8 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
if (itemId == R.id.action_upload_list_cancelled_clear) { if (itemId == R.id.action_upload_list_cancelled_clear) {
uploadsStorageManager.clearCancelledUploadsForCurrentAccount(); uploadsStorageManager.clearCancelledUploadsForCurrentAccount();
loadUploadItemsFromDb(); loadUploadItemsFromDb();
FileDataStorageManager.clearTempEncryptedFolder(parentActivity);
} else if (itemId == R.id.action_upload_list_cancelled_resume) { } else if (itemId == R.id.action_upload_list_cancelled_resume) {
retryCancelledUploads(); retryCancelledUploads();
} }

11
app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java
View file

@ -548,16 +548,7 @@ public final class EncryptionUtils {
} }
public static EncryptedFile encryptFile(Context context, File file, Cipher cipher) throws InvalidParameterSpecException, IOException { public static EncryptedFile encryptFile(Context context, File file, Cipher cipher) throws InvalidParameterSpecException, IOException {
String dirPath = context.getFilesDir().getAbsolutePath() + File.separator + "temp_encrypted_folder"; File tempEncryptedFolder = FileDataStorageManager.createTempEncryptedFolder(context);
File tempEncryptedFolder = new File(dirPath);
if (!tempEncryptedFolder.exists()) {
boolean isTempEncryptedFolderCreated = tempEncryptedFolder.mkdirs();
Log_OC.d(TAG, "tempEncryptedFolder created" + isTempEncryptedFolderCreated);
} else {
Log_OC.d(TAG, "tempEncryptedFolder already exists");
}
File tempEncryptedFile = File.createTempFile(file.getName(), null, tempEncryptedFolder); File tempEncryptedFile = File.createTempFile(file.getName(), null, tempEncryptedFolder);
encryptFileWithGivenCipher(file, tempEncryptedFile, cipher); encryptFileWithGivenCipher(file, tempEncryptedFile, cipher);
String authenticationTagString = getAuthenticationTag(cipher); String authenticationTagString = getAuthenticationTag(cipher);