diff options
Diffstat (limited to 'src/corelib/time/qtimezoneprivate_android.cpp')
-rw-r--r-- | src/corelib/time/qtimezoneprivate_android.cpp | 87 |
1 files changed, 44 insertions, 43 deletions
diff --git a/src/corelib/time/qtimezoneprivate_android.cpp b/src/corelib/time/qtimezoneprivate_android.cpp index 43a4593104..862b48477b 100644 --- a/src/corelib/time/qtimezoneprivate_android.cpp +++ b/src/corelib/time/qtimezoneprivate_android.cpp @@ -7,9 +7,14 @@ #include <QtCore/QJniEnvironment> #include <QtCore/QSet> +#include <QtCore/qjnitypes.h> QT_BEGIN_NAMESPACE +Q_DECLARE_JNI_CLASS(TimeZone, "java/util/TimeZone"); +Q_DECLARE_JNI_CLASS(Locale, "java/util/Locale"); +Q_DECLARE_JNI_CLASS(Date, "java/util/Date"); + /* Private @@ -25,9 +30,9 @@ QAndroidTimeZonePrivate::QAndroidTimeZonePrivate() : QTimeZonePrivate() { // Keep in sync with systemTimeZoneId(): - androidTimeZone = QJniObject::callStaticObjectMethod( - "java.util.TimeZone", "getDefault", "()Ljava/util/TimeZone;"); - const QJniObject id = androidTimeZone.callObjectMethod("getID", "()Ljava/lang/String;"); + androidTimeZone = QJniObject::callStaticMethod<QtJniTypes::TimeZone>( + QtJniTypes::Traits<QtJniTypes::TimeZone>::className(), "getDefault"); + const QJniObject id = androidTimeZone.callMethod<jstring>("getID"); m_id = id.toString().toUtf8(); } @@ -53,20 +58,19 @@ static QString getDisplayName(QJniObject zone, jint style, jboolean dst, const QLocale &locale) { QJniObject jbcpTag = QJniObject::fromString(locale.bcp47Name()); - QJniObject jlocale = QJniObject::callStaticObjectMethod( - "java/util/Locale", "forLanguageTag", "(Ljava/lang/String;)Ljava/util/Locale;", + QJniObject jlocale = QJniObject::callStaticMethod<QtJniTypes::Locale>( + QtJniTypes::Traits<QtJniTypes::Locale>::className(), "forLanguageTag", jbcpTag.object<jstring>()); - return zone.callObjectMethod("getDisplayName", - "(ZILjava/util/Locale;)Ljava/lang/String;", - dst, style, jlocale.object()).toString(); + return zone.callMethod<jstring>("getDisplayName", dst, style, + jlocale.object<QtJniTypes::Locale>()).toString(); } void QAndroidTimeZonePrivate::init(const QByteArray &ianaId) { const QString iana = QString::fromUtf8(ianaId); - androidTimeZone = QJniObject::callStaticObjectMethod( - "java.util.TimeZone", "getTimeZone", "(Ljava/lang/String;)Ljava/util/TimeZone;", + androidTimeZone = QJniObject::callStaticMethod<QtJniTypes::TimeZone>( + QtJniTypes::Traits<QtJniTypes::TimeZone>::className(), "getTimeZone", QJniObject::fromString(iana).object<jstring>()); // The ID or display name of the zone we've got, if it looks like what we asked for: @@ -81,7 +85,7 @@ void QAndroidTimeZonePrivate::init(const QByteArray &ianaId) // recognize the name; so check for whether ianaId is a recognized name of // the zone object we got and ignore the zone if not. // Try checking ianaId against getID(), getDisplayName(): - m_id = match(androidTimeZone.callObjectMethod("getID", "()Ljava/lang/String;").toString()); + m_id = match(androidTimeZone.callMethod<jstring>("getID").toString()); for (int style = 1; m_id.isEmpty() && style >= 0; --style) { for (int dst = 1; m_id.isEmpty() && dst >= 0; --dst) { for (int pick = 2; m_id.isEmpty() && pick >= 0; --pick) { @@ -128,11 +132,13 @@ int QAndroidTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const { // offsetFromUtc( ) is invoked when androidTimeZone may not yet be set at startup, // so a validity test is needed here - if ( androidTimeZone.isValid() ) + if ( androidTimeZone.isValid() ) { // the java method getOffset() returns milliseconds, but QTimeZone returns seconds - return androidTimeZone.callMethod<jint>( "getOffset", "(J)I", static_cast<jlong>(atMSecsSinceEpoch) ) / 1000; - else + return androidTimeZone.callMethod<jint>( + "getOffset", static_cast<jlong>(atMSecsSinceEpoch) ) / 1000; + } else { return 0; + } } int QAndroidTimeZonePrivate::standardTimeOffset(qint64 atMSecsSinceEpoch) const @@ -163,8 +169,10 @@ bool QAndroidTimeZonePrivate::hasDaylightTime() const bool QAndroidTimeZonePrivate::isDaylightTime(qint64 atMSecsSinceEpoch) const { if ( androidTimeZone.isValid() ) { - QJniObject jDate( "java/util/Date", "(J)V", static_cast<jlong>(atMSecsSinceEpoch) ); - return androidTimeZone.callMethod<jboolean>("inDaylightTime", "(Ljava/util/Date;)Z", jDate.object() ); + QJniObject jDate = QJniObject::construct<QtJniTypes::Date>( + static_cast<jlong>(atMSecsSinceEpoch)); + return androidTimeZone.callMethod<jboolean>("inDaylightTime", + jDate.object<QtJniTypes::Date>()); } else return false; @@ -173,16 +181,11 @@ bool QAndroidTimeZonePrivate::isDaylightTime(qint64 atMSecsSinceEpoch) const QTimeZonePrivate::Data QAndroidTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const { if (androidTimeZone.isValid()) { - Data data; - data.atMSecsSinceEpoch = forMSecsSinceEpoch; - data.standardTimeOffset = standardTimeOffset(forMSecsSinceEpoch); - data.offsetFromUtc = offsetFromUtc(forMSecsSinceEpoch); - data.daylightTimeOffset = data.offsetFromUtc - data.standardTimeOffset; - data.abbreviation = abbreviation(forMSecsSinceEpoch); - return data; - } else { - return invalidData(); + return Data(abbreviation(forMSecsSinceEpoch), forMSecsSinceEpoch, + offsetFromUtc(forMSecsSinceEpoch), + standardTimeOffset(forMSecsSinceEpoch)); } + return {}; } // java.util.TimeZone does not directly provide transitions, @@ -191,30 +194,28 @@ QTimeZonePrivate::Data QAndroidTimeZonePrivate::data(qint64 forMSecsSinceEpoch) QByteArray QAndroidTimeZonePrivate::systemTimeZoneId() const { // Keep in sync with default constructor: - QJniObject androidSystemTimeZone = QJniObject::callStaticObjectMethod( - "java.util.TimeZone", "getDefault", "()Ljava/util/TimeZone;"); - const QJniObject id = androidSystemTimeZone.callObjectMethod<jstring>("getID"); + QJniObject androidSystemTimeZone = QJniObject::callStaticMethod<QtJniTypes::TimeZone>( + QtJniTypes::Traits<QtJniTypes::TimeZone>::className(), "getDefault"); + const QJniObject id = androidSystemTimeZone.callMethod<jstring>("getID"); return id.toString().toUtf8(); } +bool QAndroidTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const +{ + QAndroidTimeZonePrivate probe(ianaId); + return probe.isValid(); +} + QList<QByteArray> QAndroidTimeZonePrivate::availableTimeZoneIds() const { + using namespace QtJniTypes; + + const QJniArray androidAvailableIdList = TimeZone::callStaticMethod<String[]>("getAvailableIDs"); + QList<QByteArray> availableTimeZoneIdList; - QJniObject androidAvailableIdList = QJniObject::callStaticObjectMethod("java.util.TimeZone", "getAvailableIDs", "()[Ljava/lang/String;"); - - QJniEnvironment jniEnv; - int androidTZcount = jniEnv->GetArrayLength(androidAvailableIdList.object<jarray>()); - - // need separate jobject and QJniObject here so that we can delete (DeleteLocalRef) the reference to the jobject - // (or else the JNI reference table fills after 512 entries from GetObjectArrayElement) - jobject androidTZobject; - QJniObject androidTZ; - for (int i = 0; i < androidTZcount; i++) { - androidTZobject = jniEnv->GetObjectArrayElement(androidAvailableIdList.object<jobjectArray>(), i); - androidTZ = androidTZobject; - availableTimeZoneIdList.append(androidTZ.toString().toUtf8()); - jniEnv->DeleteLocalRef(androidTZobject); - } + availableTimeZoneIdList.reserve(androidAvailableIdList.size()); + for (const auto &id : androidAvailableIdList) + availableTimeZoneIdList.append(id.toString().toUtf8()); return availableTimeZoneIdList; } |