LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDK Updater: fix download URL, fix checksum computation.

Browse Source
This commit is contained in:
Raphael
2009-06-02 22:12:01 -07:00
parent c7ee895b44
commit b997c230db
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java
View File

@@ -62,7 +62,7 @@ public class RepoSource implements IDescription {
setDefaultDescription(); setDefaultDescription();
} }
/** Returns the URL of the source repository. */ /** Returns the URL of the repository.xml file for this source. */
public String getUrl() { public String getUrl() {
return mUrl; return mUrl;
} }

44
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
View File

@@ -57,7 +57,7 @@ import java.util.Collection;
*/ */
public class UpdaterWindowImpl { public class UpdaterWindowImpl {
private static final int NUM_FETCH_URL_MONITOR_INC = 10; private static final int NUM_FETCH_URL_MONITOR_INC = 100;
/** Internal data shared between the window and its pages. */ /** Internal data shared between the window and its pages. */
private final UpdaterData mUpdaterData = new UpdaterData(); private final UpdaterData mUpdaterData = new UpdaterData();
@@ -342,7 +342,7 @@ public class UpdaterWindowImpl {
mTaskFactory.start("Installing Archives", new ITask() { mTaskFactory.start("Installing Archives", new ITask() {
public void run(ITaskMonitor monitor) { public void run(ITaskMonitor monitor) {
monitor.setProgressMax(archives.size() * (NUM_FETCH_URL_MONITOR_INC + 3)); monitor.setProgressMax(archives.size() * (NUM_FETCH_URL_MONITOR_INC + 10));
monitor.setDescription("Preparing to install archives"); monitor.setDescription("Preparing to install archives");
int num_installed = 0; int num_installed = 0;
@@ -351,20 +351,23 @@ public class UpdaterWindowImpl {
if (!archive.isCompatible()) { if (!archive.isCompatible()) {
monitor.setResult("Skipping incompatible archive: %1$s", monitor.setResult("Skipping incompatible archive: %1$s",
archive.getShortDescription()); archive.getShortDescription());
monitor.incProgress(3); monitor.incProgress(NUM_FETCH_URL_MONITOR_INC + 10);
continue; continue;
} }
File archiveFile = null; File archiveFile = null;
try { try {
archiveFile = downloadArchive(archive, monitor); archiveFile = downloadArchive(archive, monitor);
monitor.incProgress(1);
if (archiveFile != null) { if (archiveFile != null) {
if (installArchive(archive, archiveFile, monitor)) { if (installArchive(archive, archiveFile, monitor)) {
num_installed++; num_installed++;
} }
} }
monitor.incProgress(1); monitor.incProgress(10);
} catch (Throwable t) {
// Display anything unexpected in the monitor.
monitor.setResult("Unexpected Error: %1$s", t.getMessage());
} finally { } finally {
if (archiveFile != null) { if (archiveFile != null) {
if (!archiveFile.delete()) { if (!archiveFile.delete()) {
@@ -387,10 +390,13 @@ public class UpdaterWindowImpl {
*/ */
private File downloadArchive(Archive archive, ITaskMonitor monitor) { private File downloadArchive(Archive archive, ITaskMonitor monitor) {
File tmpFileToDelete = null;
try { try {
File tmpFile = File.createTempFile("sdkupload", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ File tmpFile = File.createTempFile("sdkupload", ".bin"); //$NON-NLS-1$ //$NON-NLS-2$
tmpFileToDelete = tmpFile;
monitor.setDescription("Downloading %1$s", archive.getShortDescription()); monitor.setDescription("Downloading %1$s",
archive.getParentPackage().getShortDescription());
String link = archive.getUrl(); String link = archive.getUrl();
if (!link.startsWith("http://") //$NON-NLS-1$ if (!link.startsWith("http://") //$NON-NLS-1$
@@ -405,18 +411,30 @@ public class UpdaterWindowImpl {
return null; return null;
} }
String base = src.getUrl(); // take the URL to the repository.xml and remove the last component
if (!base.endsWith("/") && !link.startsWith("/")) { //$NON-NLS-1$ //$NON-NLS-2$ // to get the base
base += "/"; //$NON-NLS-1$ String repoXml = src.getUrl();
} int pos = repoXml.lastIndexOf('/');
String base = repoXml.substring(0, pos + 1);
link = base + link; link = base + link;
} }
fetchUrl(tmpFile, archive, link, monitor); if (fetchUrl(tmpFile, archive, link, monitor)) {
// Fetching was successful, don't delete the temp file here!
tmpFileToDelete = null;
return tmpFile;
}
} catch (IOException e) { } catch (IOException e) {
monitor.setResult(e.getMessage()); monitor.setResult(e.getMessage());
} finally {
if (tmpFileToDelete != null) {
if (!tmpFileToDelete.delete()) {
tmpFileToDelete.deleteOnExit();
}
}
} }
return null; return null;
} }
@@ -481,7 +499,7 @@ public class UpdaterWindowImpl {
String hex = "0123456789abcdef"; //$NON-NLS-1$ String hex = "0123456789abcdef"; //$NON-NLS-1$
char[] hexDigest = new char[n * 2]; char[] hexDigest = new char[n * 2];
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
byte b = digest[i]; int b = digest[i] & 0x0FF;
hexDigest[i*2 + 0] = hex.charAt(b >>> 4); hexDigest[i*2 + 0] = hex.charAt(b >>> 4);
hexDigest[i*2 + 1] = hex.charAt(b & 0x0f); hexDigest[i*2 + 1] = hex.charAt(b & 0x0f);
} }