mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Move full restore logic into separate function

Browse source
This commit is contained in:
Steve Soltys 2017-10-09 21:21:15 -04:00
parent f41d211ddc
commit 93c91db524
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/com/stevesoltys/backup/transport/component/provider/restore/ContentProviderRestoreComponent.java
View file

@ -156,12 +156,11 @@ public class ContentProviderRestoreComponent implements RestoreComponent {
} }
@Override @Override
public int getNextFullRestoreDataChunk(ParcelFileDescriptor fileDescriptor) { public int getNextFullRestoreDataChunk(ParcelFileDescriptor outputFileDescriptor) {
Preconditions.checkState(restoreState.getRestoreType() == TYPE_FULL_STREAM, Preconditions.checkState(restoreState.getRestoreType() == TYPE_FULL_STREAM,
"Asked for full restore data for non-stream package"); "Asked for full restore data for non-stream package");
ParcelFileDescriptor inputFileDescriptor = restoreState.getInputFileDescriptor(); ParcelFileDescriptor inputFileDescriptor = restoreState.getInputFileDescriptor();
ZipInputStream inputStream = restoreState.getInputStream();
if (inputFileDescriptor == null) { if (inputFileDescriptor == null) {
String name = restoreState.getPackages()[restoreState.getPackageIndex()].packageName; String name = restoreState.getPackages()[restoreState.getPackageIndex()].packageName;
@ -170,7 +169,7 @@ public class ContentProviderRestoreComponent implements RestoreComponent {
inputFileDescriptor = buildInputFileDescriptor(); inputFileDescriptor = buildInputFileDescriptor();
restoreState.setInputFileDescriptor(inputFileDescriptor); restoreState.setInputFileDescriptor(inputFileDescriptor);
inputStream = buildInputStream(inputFileDescriptor); ZipInputStream inputStream = buildInputStream(inputFileDescriptor);
restoreState.setInputStream(inputStream); restoreState.setInputStream(inputStream);
if (!seekToEntry(inputStream, configuration.getFullBackupDirectory() + name).isPresent()) { if (!seekToEntry(inputStream, configuration.getFullBackupDirectory() + name).isPresent()) {
@ -189,9 +188,14 @@ public class ContentProviderRestoreComponent implements RestoreComponent {
} }
if (restoreState.getOutputStream() == null) { if (restoreState.getOutputStream() == null) {
restoreState.setOutputStream(new FileOutputStream(fileDescriptor.getFileDescriptor())); restoreState.setOutputStream(new FileOutputStream(outputFileDescriptor.getFileDescriptor()));
} }
return transferFullRestoreData(outputFileDescriptor);
}
private int transferFullRestoreData(ParcelFileDescriptor outputFileDescriptor) {
ZipInputStream inputStream = restoreState.getInputStream();
OutputStream outputStream = restoreState.getOutputStream(); OutputStream outputStream = restoreState.getOutputStream();
byte[] buffer = new byte[DEFAULT_BUFFER_SIZE]; byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
@ -212,10 +216,11 @@ public class ContentProviderRestoreComponent implements RestoreComponent {
} finally { } finally {
if (bytesRead == NO_MORE_DATA) { if (bytesRead == NO_MORE_DATA) {
if (inputFileDescriptor != null) {
IoUtils.closeQuietly(inputFileDescriptor.getFileDescriptor()); if (restoreState.getInputFileDescriptor() != null) {
IoUtils.closeQuietly(restoreState.getInputFileDescriptor().getFileDescriptor());
} }
IoUtils.closeQuietly(fileDescriptor.getFileDescriptor()); IoUtils.closeQuietly(outputFileDescriptor.getFileDescriptor());
restoreState.setInputFileDescriptor(null); restoreState.setInputFileDescriptor(null);
restoreState.setInputStream(null); restoreState.setInputStream(null);