- Revert access request to CopyToCacheAsyncTask
diff --git a/FairphoneUpdater/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java b/FairphoneUpdater/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
index 158623a..2b15c73 100644
--- a/FairphoneUpdater/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
+++ b/FairphoneUpdater/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
@@ -498,9 +498,8 @@
// remove the update files from data
removeUpdateFilesFromData();
+
// reboot the device into recovery
- // ((PowerManager)
- // getSystemService(POWER_SERVICE)).reboot("recovery");
try
{
mainActivity.updateStatePreference(UpdaterState.NORMAL);
@@ -529,15 +528,8 @@
{
if (canCopyToCache())
{
- if (RootTools.isAccessGiven())
- {
- CopyFileToCacheTask copyTask = new CopyFileToCacheTask();
- copyTask.execute(file.getPath(), Environment.getDownloadCacheDirectory() + "/" + VersionParserHelper.getNameFromVersion(mSelectedVersion));
- }
- else
- {
- abortUpdateProccess();
- }
+ CopyFileToCacheTask copyTask = new CopyFileToCacheTask();
+ copyTask.execute(file.getPath(), Environment.getDownloadCacheDirectory() + "/" + VersionParserHelper.getNameFromVersion(mSelectedVersion));
}
else
{
@@ -638,6 +630,10 @@
RootTools.copyFile(otaFilePath.getPath(), otaFileCache.getPath(), false, false);
}
}
+ else
+ {
+ abortUpdateProccess();
+ }
return 1;
}