From 059599e8fd59e4439cc1b29ab92f79abcf2487ea Mon Sep 17 00:00:00 2001
From: Daniel Elstner <daniel.kitta@gmail.com>
Date: Thu, 1 Oct 2015 14:59:03 +0200
Subject: [PATCH] android: Check for firmware in standard locations, too

---
 android/assetreader.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/android/assetreader.cpp b/android/assetreader.cpp
index bf76704..f14e7b6 100644
--- a/android/assetreader.cpp
+++ b/android/assetreader.cpp
@@ -22,6 +22,7 @@
 #include <memory>
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
+#include <QtCore/QStandardPaths>
 
 using namespace pv;
 
@@ -31,7 +32,11 @@ AndroidAssetReader::~AndroidAssetReader()
 void AndroidAssetReader::open(struct sr_resource *res, std::string name)
 {
 	if (res->type == SR_RESOURCE_FIRMWARE) {
-		const auto path = QString::fromStdString("assets:/sigrok-firmware/" + name);
+		auto path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+						   QString::fromStdString("sigrok-firmware/" + name));
+		if (path.isEmpty())
+			path = QString::fromStdString("assets:/sigrok-firmware/" + name);
+
 		std::unique_ptr<QFile> file {new QFile{path}};
 
 		if (!file->open(QIODevice::ReadOnly))
-- 
2.30.2