forked from qt-creator/qt-creator
9e2554b660
The exctraction of the downloaded commandlinetools zip file via java's jar tool did suddenly not work anymore on Windows. The exit code of jarExtractProc in AndroidSdkDownloader::extractSdk would be != 0. Instead of fixing the jar usage, this change replaces it with the recently added Utils::Archive. That has the advantage that it preserves the file permissions while exctracting, so that we can also get rid of setSdkFilesExecPermission. Another advantage is that the SDK can be extracted even before a jdk has been selected. Change-Id: I99cc2aff8e183108eb11dbf96f06557e5b299d56 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
81 lines
2.4 KiB
C++
81 lines
2.4 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2020 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef ANDROIDSDKDOWNLOADER_H
|
|
#define ANDROIDSDKDOWNLOADER_H
|
|
|
|
#include "androidconfigurations.h"
|
|
|
|
#include <QNetworkReply>
|
|
#include <QObject>
|
|
#include <QProgressDialog>
|
|
|
|
namespace Utils { class FilePath; }
|
|
|
|
namespace Android {
|
|
namespace Internal {
|
|
|
|
class AndroidSdkDownloader : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
AndroidSdkDownloader();
|
|
void downloadAndExtractSdk(const Utils::FilePath &sdkExtractPath);
|
|
static QString dialogTitle();
|
|
|
|
void cancel();
|
|
|
|
signals:
|
|
void sdkPackageWriteFinished();
|
|
void sdkExtracted();
|
|
void sdkDownloaderError(const QString &error);
|
|
|
|
private:
|
|
static Utils::FilePath getSaveFilename(const QUrl &url);
|
|
bool saveToDisk(const Utils::FilePath &filename, QIODevice *data);
|
|
static bool isHttpRedirect(QNetworkReply *m_reply);
|
|
|
|
bool verifyFileIntegrity();
|
|
void cancelWithError(const QString &error);
|
|
void logError(const QString &error);
|
|
|
|
void downloadFinished(QNetworkReply *m_reply);
|
|
#if QT_CONFIG(ssl)
|
|
void sslErrors(const QList<QSslError> &errors);
|
|
#endif
|
|
|
|
QNetworkAccessManager m_manager;
|
|
QNetworkReply *m_reply = nullptr;
|
|
Utils::FilePath m_sdkFilename;
|
|
QProgressDialog *m_progressDialog = nullptr;
|
|
const AndroidConfig &m_androidConfig;
|
|
};
|
|
|
|
} // Internal
|
|
} // Android
|
|
|
|
#endif // ANDROIDSDKDOWNLOADER_H
|