diff options
Diffstat (limited to 'src/corelib/time/qtimezoneprivate_android.cpp')
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_android.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/corelib/time/qtimezoneprivate_android.cpp b/src/corelib/time/qtimezoneprivate_android.cpp index ba87cf79fe..3609c65d55 100644 --- a/src/corelib/time/qtimezoneprivate_android.cpp +++ b/src/corelib/time/qtimezoneprivate_android.cpp @@ -48,6 +48,10 @@ QT_BEGIN_NAMESPACE Private Android implementation + + Note that a QJNIObjectPrivate manages a global reference, so it serves as an + owning smart-pointer, ensuring an object doesn't get garbage-collected + before we're done with it. */ // Create the system default time zone @@ -57,7 +61,8 @@ QAndroidTimeZonePrivate::QAndroidTimeZonePrivate() // Keep in sync with systemTimeZoneId(): androidTimeZone = QJNIObjectPrivate::callStaticObjectMethod( "java.util.TimeZone", "getDefault", "()Ljava/util/TimeZone;"); - m_id = androidTimeZone.callObjectMethod("getID", "()Ljava/lang/String;").toString().toUtf8(); + const QJNIObjectPrivate id = androidTimeZone.callObjectMethod("getID", "()Ljava/lang/String;"); + m_id = id.toString().toUtf8(); } // Create a named time zone @@ -81,17 +86,10 @@ QAndroidTimeZonePrivate::~QAndroidTimeZonePrivate() static QJNIObjectPrivate getDisplayName(QJNIObjectPrivate zone, jint style, jboolean dst, const QLocale &locale) { - QJNIObjectPrivate jlanguage - = QJNIObjectPrivate::fromString(QLocale::languageToString(locale.language())); - QJNIObjectPrivate jcountry - = QJNIObjectPrivate::fromString(QLocale::countryToString(locale.country())); - QJNIObjectPrivate - jvariant = QJNIObjectPrivate::fromString(QLocale::scriptToString(locale.script())); - QJNIObjectPrivate jlocale("java.util.Locale", - "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", - static_cast<jstring>(jlanguage.object()), - static_cast<jstring>(jcountry.object()), - static_cast<jstring>(jvariant.object())); + QJNIObjectPrivate jbcpTag = QJNIObjectPrivate::fromString(locale.bcp47Name()); + QJNIObjectPrivate jlocale = QJNIObjectPrivate::callStaticObjectMethod( + "java/util/Locale", "forLanguageTag", "(Ljava/lang/String;)Ljava/util/Locale;", + static_cast<jstring>(jbcpTag.object())); return zone.callObjectMethod("getDisplayName", "(ZILjava/util/Locale;)Ljava/lang/String;", @@ -108,7 +106,7 @@ void QAndroidTimeZonePrivate::init(const QByteArray &ianaId) // The ID or display name of the zone we've got, if it looks like what we asked for: const auto match = [iana](const QJNIObjectPrivate &jname) -> QByteArray { const QString name = jname.toString(); - if (iana.compare(name, Qt::CaseInsensitive)) + if (iana.compare(name, Qt::CaseInsensitive) == 0) return name.toUtf8(); return QByteArray(); @@ -247,7 +245,8 @@ QByteArray QAndroidTimeZonePrivate::systemTimeZoneId() const // Keep in sync with default constructor: QJNIObjectPrivate androidSystemTimeZone = QJNIObjectPrivate::callStaticObjectMethod( "java.util.TimeZone", "getDefault", "()Ljava/util/TimeZone;"); - return androidSystemTimeZone.callObjectMethod<jstring>("getID").toString().toUtf8(); + const QJNIObjectPrivate id = androidSystemTimeZone.callObjectMethod<jstring>("getID"); + return id.toString().toUtf8(); } QList<QByteArray> QAndroidTimeZonePrivate::availableTimeZoneIds() const |