Commit fb35cf43 authored by Volker Krause's avatar Volker Krause

Add Qt file engine for Android content URLs

This makes QFile support content URLs directly, like local files. This
is obviously meant for upstreaming, but it's much easier to test here.
parent 3135b3b1
......@@ -51,7 +51,10 @@ set(itinerary_app_srcs
publictransport.cpp
)
if (ANDROID)
list(APPEND itinerary_app_srcs androidbrightnessbackend.cpp)
list(APPEND itinerary_app_srcs
androidbrightnessbackend.cpp
androidcontentfileengine.cpp
)
else()
list(APPEND itinerary_app_srcs solidbrightnessbackend.cpp)
qt5_add_dbus_interface(itinerary_app_srcs org.kde.Solid.PowerManagement.Actions.BrightnessControl.xml brightnesscontroldbusinterface)
......@@ -69,6 +72,7 @@ if (TARGET KF5::Notifications)
target_link_libraries(itinerary-app PRIVATE KF5::Notifications)
endif()
if (ANDROID)
target_include_directories(itinerary-app PRIVATE ${Qt5Core_PRIVATE_INCLUDE_DIRS})
# explicitly add runtime dependencies and transitive link dependencies,
# so androiddeployqt picks them up
target_link_libraries(itinerary PUBLIC Qt5::AndroidExtras)
......
/****************************************************************************
**
** Copyright (C) 2019 Volker Krause <vkrause@kde.org>
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** 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 Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** 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-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "androidcontentfileengine.h"
#include <private/qjni_p.h>
#include <private/qjnihelpers_p.h>
#include <QDebug>
AndroidContentFileEngine::AndroidContentFileEngine(const QString &fileName)
: QFSFileEngine(fileName)
{
}
bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode)
{
QString openModeStr;
if (openMode & QFileDevice::ReadOnly) {
openModeStr += QLatin1Char('r');
}
if (openMode & QFileDevice::WriteOnly) {
openModeStr += QLatin1Char('w');
}
if (openMode & QFileDevice::Truncate) {
openModeStr += QLatin1Char('t');
} else if (openMode & QFileDevice::Append) {
openModeStr += QLatin1Char('a');
}
const auto fd = QJNIObjectPrivate::callStaticMethod<jint>("org/kde/itinerary/ContentFileEngine",
"openFdForContentUri",
"(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)I",
QtAndroidPrivate::context(),
QJNIObjectPrivate::fromString(fileName(DefaultName)).object(),
QJNIObjectPrivate::fromString(openModeStr).object());
if (fd < 0) {
return false;
}
return QFSFileEngine::open(openMode, fd, QFile::AutoCloseHandle);
}
AndroidContentFileEngineHandler::AndroidContentFileEngineHandler() = default;
AndroidContentFileEngineHandler::~AndroidContentFileEngineHandler() = default;
QAbstractFileEngine* AndroidContentFileEngineHandler::create(const QString &fileName) const
{
if (!fileName.startsWith(QLatin1String("content"))) {
return nullptr;
}
return new AndroidContentFileEngine(fileName);
}
/****************************************************************************
**
** Copyright (C) 2019 Volker Krause <vkrause@kde.org>
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** 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 Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** 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-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef ANDROIDCONTENTFILEENGINE_H
#define ANDROIDCONTENTFILEENGINE_H
#include <private/qfsfileengine_p.h>
class AndroidContentFileEngine : public QFSFileEngine
{
public:
AndroidContentFileEngine(const QString &fileName);
bool open(QIODevice::OpenMode openMode) override;
};
class AndroidContentFileEngineHandler : public QAbstractFileEngineHandler
{
public:
AndroidContentFileEngineHandler();
~AndroidContentFileEngineHandler();
QAbstractFileEngine *create(const QString &fileName) const override;
};
#endif // ANDROIDCONTENTFILEENGINE_H
......@@ -60,6 +60,7 @@
#include <QQmlContext>
#ifdef Q_OS_ANDROID
#include "androidcontentfileengine.h"
#include <QtAndroid>
#include <QAndroidJniObject>
#else
......@@ -113,6 +114,7 @@ int main(int argc, char **argv)
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#ifdef Q_OS_ANDROID
AndroidContentFileEngineHandler fsEngineHandler;
QGuiApplication app(argc, argv);
#else
QApplication app(argc, argv); // for native file dialogs
......
/****************************************************************************
**
** Copyright (C) 2019 Volker Krause <vkrause@kde.org>
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** 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 Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** 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-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
package org.kde.itinerary;
import android.content.ContentResolver;
import android.content.Context;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
import java.io.FileNotFoundException;
public class ContentFileEngine
{
static public int openFdForContentUri(Context context, String contentUri, String openMode)
{
try {
ContentResolver resolver = context.getContentResolver();
ParcelFileDescriptor fdDesc = resolver.openFileDescriptor(Uri.parse(contentUri), openMode);
return fdDesc.detachFd();
} catch (FileNotFoundException e) {
return -1;
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment