summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/androidcontentfileengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/android/androidcontentfileengine.cpp')
-rw-r--r--src/plugins/platforms/android/androidcontentfileengine.cpp57
1 files changed, 27 insertions, 30 deletions
diff --git a/src/plugins/platforms/android/androidcontentfileengine.cpp b/src/plugins/platforms/android/androidcontentfileengine.cpp
index 5757f5d8cc0..f4afb3789a0 100644
--- a/src/plugins/platforms/android/androidcontentfileengine.cpp
+++ b/src/plugins/platforms/android/androidcontentfileengine.cpp
@@ -16,9 +16,6 @@ QT_BEGIN_NAMESPACE
using namespace QNativeInterface;
using namespace Qt::StringLiterals;
-Q_DECLARE_JNI_CLASS(ContentResolverType, "android/content/ContentResolver");
-Q_DECLARE_JNI_CLASS(UriType, "android/net/Uri");
-Q_DECLARE_JNI_CLASS(Uri, "android/net/Uri");
Q_DECLARE_JNI_CLASS(ParcelFileDescriptorType, "android/os/ParcelFileDescriptor");
Q_DECLARE_JNI_CLASS(CursorType, "android/database/Cursor");
@@ -27,7 +24,7 @@ static QJniObject &contentResolverInstance()
static QJniObject contentResolver;
if (!contentResolver.isValid()) {
contentResolver = QJniObject(QNativeInterface::QAndroidApplication::context())
- .callMethod<QtJniTypes::ContentResolverType>("getContentResolver");
+ .callMethod<QtJniTypes::ContentResolver>("getContentResolver");
}
return contentResolver;
@@ -79,7 +76,7 @@ bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode,
}
m_pfd = contentResolverInstance().callMethod<
- QtJniTypes::ParcelFileDescriptorType, QtJniTypes::UriType, jstring>(
+ QtJniTypes::ParcelFileDescriptorType, QtJniTypes::Uri, jstring>(
"openFileDescriptor",
m_documentFile->uri().object(),
QJniObject::fromString(openModeStr).object<jstring>());
@@ -373,7 +370,7 @@ public:
{
auto cursor = contentResolverInstance().callMethod<QtJniTypes::CursorType>(
"query",
- uri.object<QtJniTypes::UriType>(),
+ uri.object<QtJniTypes::Uri>(),
QJniArray(projection),
selection.isEmpty() ? nullptr : QJniObject::fromString(selection).object<jstring>(),
QJniArray(selectionArgs),
@@ -451,7 +448,7 @@ const QLatin1String MIME_TYPE_DIR("vnd.android.document/directory");
QString documentId(const QJniObject &uri)
{
- return QJniObject::callStaticMethod<jstring, QtJniTypes::UriType>(
+ return QJniObject::callStaticMethod<jstring, QtJniTypes::Uri>(
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"getDocumentId",
uri.object()).toString();
@@ -459,7 +456,7 @@ QString documentId(const QJniObject &uri)
QString treeDocumentId(const QJniObject &uri)
{
- return QJniObject::callStaticMethod<jstring, QtJniTypes::UriType>(
+ return QJniObject::callStaticMethod<jstring, QtJniTypes::Uri>(
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"getTreeDocumentId",
uri.object()).toString();
@@ -467,20 +464,20 @@ QString treeDocumentId(const QJniObject &uri)
QJniObject buildChildDocumentsUriUsingTree(const QJniObject &uri, const QString &parentDocumentId)
{
- return QJniObject::callStaticMethod<QtJniTypes::UriType>(
+ return QJniObject::callStaticMethod<QtJniTypes::Uri>(
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"buildChildDocumentsUriUsingTree",
- uri.object<QtJniTypes::UriType>(),
+ uri.object<QtJniTypes::Uri>(),
QJniObject::fromString(parentDocumentId).object<jstring>());
}
QJniObject buildDocumentUriUsingTree(const QJniObject &treeUri, const QString &documentId)
{
- return QJniObject::callStaticMethod<QtJniTypes::UriType>(
+ return QJniObject::callStaticMethod<QtJniTypes::Uri>(
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"buildDocumentUriUsingTree",
- treeUri.object<QtJniTypes::UriType>(),
+ treeUri.object<QtJniTypes::Uri>(),
QJniObject::fromString(documentId).object<jstring>());
}
@@ -490,7 +487,7 @@ bool isDocumentUri(const QJniObject &uri)
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"isDocumentUri",
QNativeInterface::QAndroidApplication::context(),
- uri.object<QtJniTypes::UriType>());
+ uri.object<QtJniTypes::Uri>());
}
bool isTreeUri(const QJniObject &uri)
@@ -498,17 +495,17 @@ bool isTreeUri(const QJniObject &uri)
return QJniObject::callStaticMethod<jboolean>(
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"isTreeUri",
- uri.object<QtJniTypes::UriType>());
+ uri.object<QtJniTypes::Uri>());
}
QJniObject createDocument(const QJniObject &parentDocumentUri, const QString &mimeType,
const QString &displayName)
{
- return QJniObject::callStaticMethod<QtJniTypes::UriType>(
+ return QJniObject::callStaticMethod<QtJniTypes::Uri>(
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"createDocument",
- contentResolverInstance().object<QtJniTypes::ContentResolverType>(),
- parentDocumentUri.object<QtJniTypes::UriType>(),
+ contentResolverInstance().object<QtJniTypes::ContentResolver>(),
+ parentDocumentUri.object<QtJniTypes::Uri>(),
QJniObject::fromString(mimeType).object<jstring>(),
QJniObject::fromString(displayName).object<jstring>());
}
@@ -522,8 +519,8 @@ bool deleteDocument(const QJniObject &documentUri)
return QJniObject::callStaticMethod<jboolean>(
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"deleteDocument",
- contentResolverInstance().object<QtJniTypes::ContentResolverType>(),
- documentUri.object<QtJniTypes::UriType>());
+ contentResolverInstance().object<QtJniTypes::ContentResolver>(),
+ documentUri.object<QtJniTypes::Uri>());
}
QJniObject moveDocument(const QJniObject &sourceDocumentUri,
@@ -534,13 +531,13 @@ QJniObject moveDocument(const QJniObject &sourceDocumentUri,
if (!(flags & Document::FLAG_SUPPORTS_MOVE))
return {};
- return QJniObject::callStaticMethod<QtJniTypes::UriType>(
+ return QJniObject::callStaticMethod<QtJniTypes::Uri>(
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"moveDocument",
- contentResolverInstance().object<QtJniTypes::ContentResolverType>(),
- sourceDocumentUri.object<QtJniTypes::UriType>(),
- sourceParentDocumentUri.object<QtJniTypes::UriType>(),
- targetParentDocumentUri.object<QtJniTypes::UriType>());
+ contentResolverInstance().object<QtJniTypes::ContentResolver>(),
+ sourceDocumentUri.object<QtJniTypes::Uri>(),
+ sourceParentDocumentUri.object<QtJniTypes::Uri>(),
+ targetParentDocumentUri.object<QtJniTypes::Uri>());
}
QJniObject renameDocument(const QJniObject &documentUri, const QString &displayName)
@@ -549,11 +546,11 @@ QJniObject renameDocument(const QJniObject &documentUri, const QString &displayN
if (!(flags & Document::FLAG_SUPPORTS_RENAME))
return {};
- return QJniObject::callStaticMethod<QtJniTypes::UriType>(
+ return QJniObject::callStaticMethod<QtJniTypes::Uri>(
QtJniTypes::Traits<QtJniTypes::DocumentsContract>::className(),
"renameDocument",
- contentResolverInstance().object<QtJniTypes::ContentResolverType>(),
- documentUri.object<QtJniTypes::UriType>(),
+ contentResolverInstance().object<QtJniTypes::ContentResolver>(),
+ documentUri.object<QtJniTypes::Uri>(),
QJniObject::fromString(displayName).object<jstring>());
}
} // End DocumentsContract namespace
@@ -584,7 +581,7 @@ QJniObject parseUri(const QString &uri)
if (uriToParse.contains(' '))
uriToParse.replace(' ', QUrl::toPercentEncoding(" "));
- return QJniObject::callStaticMethod<QtJniTypes::UriType>(
+ return QJniObject::callStaticMethod<QtJniTypes::Uri>(
QtJniTypes::Traits<QtJniTypes::Uri>::className(),
"parse",
QJniObject::fromString(uriToParse).object<jstring>());
@@ -721,7 +718,7 @@ bool DocumentFile::canRead() const
{
const auto context = QJniObject(QNativeInterface::QAndroidApplication::context());
const bool selfUriPermission = context.callMethod<jint>("checkCallingOrSelfUriPermission",
- m_uri.object<QtJniTypes::UriType>(),
+ m_uri.object<QtJniTypes::Uri>(),
FLAG_GRANT_READ_URI_PERMISSION);
if (selfUriPermission != 0)
return false;
@@ -733,7 +730,7 @@ bool DocumentFile::canWrite() const
{
const auto context = QJniObject(QNativeInterface::QAndroidApplication::context());
const bool selfUriPermission = context.callMethod<jint>("checkCallingOrSelfUriPermission",
- m_uri.object<QtJniTypes::UriType>(),
+ m_uri.object<QtJniTypes::Uri>(),
FLAG_GRANT_WRITE_URI_PERMISSION);
if (selfUriPermission != 0)
return false;