X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=android%2Fassetreader.cpp;h=71aafae5c46d784de3451f164b26f0775cc1beff;hp=bf76704a8b873f724f526ab773e62c4a46562f7b;hb=ebe0a19686181a2ca873219fce38217856b5d82c;hpb=dddff2e7c658aa84f67186ade0a4845b5fb0b43f

diff --git a/android/assetreader.cpp b/android/assetreader.cpp
index bf76704a..71aafae5 100644
--- a/android/assetreader.cpp
+++ b/android/assetreader.cpp
@@ -18,21 +18,29 @@
  */
 
 #include "assetreader.hpp"
-#include <libsigrok/libsigrok.h>
+
 #include <memory>
+
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
+#include <QtCore/QStandardPaths>
+
+#include <libsigrok/libsigrok.h>
 
 using namespace pv;
 
-AndroidAssetReader::~AndroidAssetReader()
-{}
+using std::string;
+using std::unique_ptr;
 
-void AndroidAssetReader::open(struct sr_resource *res, std::string name)
+void AndroidAssetReader::open(struct sr_resource *res, string name)
 {
 	if (res->type == SR_RESOURCE_FIRMWARE) {
-		const auto path = QString::fromStdString("assets:/sigrok-firmware/" + name);
-		std::unique_ptr<QFile> file {new QFile{path}};
+		auto path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+						   QString::fromStdString("sigrok-firmware/" + name));
+		if (path.isEmpty())
+			path = QString::fromStdString("assets:/sigrok-firmware/" + name);
+
+		unique_ptr<QFile> file {new QFile{path}};
 
 		if (!file->open(QIODevice::ReadOnly))
 			throw sigrok::Error{SR_ERR};
@@ -55,7 +63,7 @@ void AndroidAssetReader::close(struct sr_resource *res)
 		qCritical("AndroidAssetReader: Invalid handle");
 		throw sigrok::Error{SR_ERR_ARG};
 	}
-	const std::unique_ptr<QFile> file {static_cast<QFile*>(res->handle)};
+	const unique_ptr<QFile> file {static_cast<QFile*>(res->handle)};
 	res->handle = nullptr;
 
 	file->close();