1 files changed, 23 insertions, 22 deletions
diff --git a/src/plugins/platforms/android/qandroidsystemlocale.cpp b/src/plugins/platforms/android/qandroidsystemlocale.cpp
index 858934b1f8..c5f2e59097 100644
--- a/src/plugins/platforms/android/qandroidsystemlocale.cpp
+++ b/src/plugins/platforms/android/qandroidsystemlocale.cpp
@@ -12,34 +12,38 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_JNI_CLASS(Locale, "java/util/Locale")
+Q_DECLARE_JNI_CLASS(Resources, "android/content/res/Resources")
+Q_DECLARE_JNI_CLASS(Configuration, "android/content/res/Configuration")
+Q_DECLARE_JNI_CLASS(LocaleList, "android/os/LocaleList")
+
+using namespace QtJniTypes;
+
 QAndroidSystemLocale::QAndroidSystemLocale() : m_locale(QLocale::C)
 {
 }
 
 void QAndroidSystemLocale::getLocaleFromJava() const
 {
-    QWriteLocker locker(&m_lock);
-
-    QJniObject javaLocaleObject;
-    QJniObject javaActivity(QtAndroid::activity());
-    if (!javaActivity.isValid())
-        javaActivity = QtAndroid::service();
-    if (javaActivity.isValid()) {
-        QJniObject resources = javaActivity.callObjectMethod("getResources", "()Landroid/content/res/Resources;");
-        QJniObject configuration = resources.callObjectMethod("getConfiguration", "()Landroid/content/res/Configuration;");
-
-        javaLocaleObject = configuration.getObjectField("locale", "Ljava/util/Locale;");
-    } else {
-        javaLocaleObject = QJniObject::callStaticObjectMethod("java/util/Locale", "getDefault", "()Ljava/util/Locale;");
-    }
+    const Locale javaLocaleObject = []{
+        const QJniObject javaContext = QtAndroidPrivate::context();
+        if (javaContext.isValid()) {
+            const QJniObject resources = javaContext.callMethod<Resources>("getResources");
+            const QJniObject configuration = resources.callMethod<Configuration>("getConfiguration");
+            return configuration.getField<Locale>("locale");
+        } else {
+            return Locale::callStaticMethod<Locale>("getDefault");
+        }
+    }();
 
-    QString languageCode = javaLocaleObject.callObjectMethod("getLanguage", "()Ljava/lang/String;").toString();
-    QString countryCode = javaLocaleObject.callObjectMethod("getCountry", "()Ljava/lang/String;").toString();
+    const QString languageCode = javaLocaleObject.callMethod<QString>("getLanguage");
+    const QString countryCode = javaLocaleObject.callMethod<QString>("getCountry");
 
+    QWriteLocker locker(&m_lock);
     m_locale = QLocale(languageCode + u'_' + countryCode);
 }
 
-QVariant QAndroidSystemLocale::query(QueryType type, QVariant in) const
+QVariant QAndroidSystemLocale::query(QueryType type, QVariant &&in) const
 {
     if (type == LocaleChanged) {
         getLocaleFromJava();
@@ -142,12 +146,9 @@ QVariant QAndroidSystemLocale::query(QueryType type, QVariant in) const
         Q_ASSERT_X(false, Q_FUNC_INFO, "This can't happen.");
     case UILanguages: {
         if (QtAndroidPrivate::androidSdkVersion() >= 24) {
-            QJniObject localeListObject =
-                QJniObject::callStaticObjectMethod("android/os/LocaleList", "getDefault",
-                                                   "()Landroid/os/LocaleList;");
+            LocaleList localeListObject = LocaleList::callStaticMethod<LocaleList>("getDefault");
             if (localeListObject.isValid()) {
-                QString lang = localeListObject.callObjectMethod("toLanguageTags",
-                                                                 "()Ljava/lang/String;").toString();
+                QString lang = localeListObject.callMethod<QString>("toLanguageTags");
                 // Some devices return with it enclosed in []'s so check if both exists before
                 // removing to ensure it is formatted correctly
                 if (lang.startsWith(QChar('[')) && lang.endsWith(QChar(']')))