diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-06-07 12:26:35 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-06-15 14:41:41 +0300 |
| commit | aa57a9cd0a33a47a8ae3ff2650630052c261aa27 (patch) | |
| tree | 6ea08094161f7fd6a572502580274914649d1752 /examples/location/geojson_viewer/main.cpp | |
| parent | 74049b0250679b35ead74aeff6e3a4a3979df4a1 (diff) | |
| download | qtlocation-aa57a9cd0a33a47a8ae3ff2650630052c261aa27.tar.gz | |
Use new permission api instead of androidextras
Change-Id: I64eeb909ef8c034defccebb29f767c69778f501d
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/location/geojson_viewer/main.cpp')
| -rw-r--r-- | examples/location/geojson_viewer/main.cpp | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/examples/location/geojson_viewer/main.cpp b/examples/location/geojson_viewer/main.cpp index 61f7d233..436a8e16 100644 --- a/examples/location/geojson_viewer/main.cpp +++ b/examples/location/geojson_viewer/main.cpp @@ -70,9 +70,6 @@ #include <QJsonArray> #include <QFileInfo> #include <QtCore/qobjectdefs.h> -#ifdef Q_OS_ANDROID -#include <QtAndroid> -#endif class extractor { @@ -250,30 +247,16 @@ public: #include "main.moc" -#ifdef Q_OS_ANDROID -// Request permissions because we're using QStandardPaths::writableLocation() -bool requestStoragePermissions() { - using namespace QtAndroid; - - QString permission = QStringLiteral("android.permission.WRITE_EXTERNAL_STORAGE"); - const QHash<QString, PermissionResult> results = requestPermissionsSync(QStringList({permission})); - if (!results.contains(permission) || results[permission] == PermissionResult::Denied) { - qWarning() << "Couldn't get permission: " << permission; - return false; - } - - return true; -} -#endif - int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); -#ifdef Q_OS_ANDROID - if (!requestStoragePermissions()) + + auto permission = QPermission::WriteStorage; + if (QCoreApplication::requestPermission(permission).result() != QPermission::Authorized) { + qWarning() << "Couldn't get 'WriteStorage' permission!"; return -1; -#endif + } QQmlApplicationEngine engine; QUrl absoluteFilePath = argc > 1 ? |