io.appium.settings 4.1.0 → 4.2.0

package/app/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 30
-        versionCode 44
-        versionName "4.1.0"
+        versionCode 47
+        versionName "4.2.0"
         applicationId "io.appium.settings"
     }
 

package/app/src/main/java/io/appium/settings/Settings.java

@@ -206,7 +206,7 @@ public class Settings extends Activity {
     private void finishActivity() {
         Log.d(TAG, "Closing the app");
         Handler handler = new Handler();
-        handler.postDelayed(Settings.this::finish, 1000);
+        handler.postDelayed(Settings.this::finish, 0);
     }
 
     @Override

package/app/src/main/java/io/appium/settings/receivers/LocaleSettingReceiver.java

@@ -26,6 +26,8 @@ import android.util.Log;
 
 import org.apache.commons.lang3.LocaleUtils;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 import io.appium.settings.handlers.LocaleSettingHandler;
@@ -54,7 +56,7 @@ public class LocaleSettingReceiver extends BroadcastReceiver implements HasActio
         // Expect https://developer.android.com/reference/java/util/Locale.html#Locale(java.lang.String,%20java.lang.String) format.
         Locale locale = new Locale(language, country);
         String script = intent.getStringExtra(SCRIPT);
-        if (!isBlank(script)) {
+        if (script != null) {
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
                 locale = new Locale.Builder().setLocale(locale).setScript(script).build();
             } else {
@@ -63,13 +65,32 @@ public class LocaleSettingReceiver extends BroadcastReceiver implements HasActio
             }
         }
         if (!LocaleUtils.isAvailableLocale(locale)) {
-            Log.e(TAG, String.format(
-                    "The locale %s is not known. Only the following locales are available: %s",
-                    locale, LocaleUtils.availableLocaleList())
-            );
-            setResultCode(Activity.RESULT_CANCELED);
-            setResultData(String.format("The locale %s is not known", locale));
-            return;
+            List<Locale> approximateMatchesLc = matchLocales(language, country);
+            if (!approximateMatchesLc.isEmpty() && isBlank(script)) {
+                Log.i(TAG, String.format(
+                        "The locale %s is not known. Selecting the closest known one %s instead",
+                        locale, approximateMatchesLc.get(0))
+                );
+                locale = approximateMatchesLc.get(0);
+            } else {
+                List<Locale> approximateMatchesL = matchLocales(language);
+                if (approximateMatchesL.isEmpty()) {
+                    Log.e(TAG, String.format(
+                            "The locale %s is not known. Only the following locales are available: %s",
+                            locale, LocaleUtils.availableLocaleList())
+                    );
+                } else {
+                    Log.e(TAG, String.format(
+                            "The locale %s is not known. " +
+                                    "The following locales are available for the %s language: %s" +
+                                    "The following locales are available altogether: %s",
+                            locale, language, approximateMatchesL, LocaleUtils.availableLocaleList())
+                    );
+                }
+                setResultCode(Activity.RESULT_CANCELED);
+                setResultData(String.format("The locale %s is not known", locale));
+                return;
+            }
         }
 
         new LocaleSettingHandler(context).setLocale(locale);
@@ -82,4 +103,25 @@ public class LocaleSettingReceiver extends BroadcastReceiver implements HasActio
     public String getAction() {
         return ACTION;
     }
+
+    private static List<Locale> matchLocales(String language) {
+        List<Locale> matches = new ArrayList<>();
+        for (Locale locale: LocaleUtils.availableLocaleList()) {
+            if (locale.getLanguage().equalsIgnoreCase(language)) {
+                matches.add(locale);
+            }
+        }
+        return matches;
+    }
+
+    private static List<Locale> matchLocales(String language, String country) {
+        List<Locale> matches = new ArrayList<>();
+        for (Locale locale: LocaleUtils.availableLocaleList()) {
+            if (locale.getLanguage().equalsIgnoreCase(language)
+                    && locale.getCountry().equalsIgnoreCase(country)) {
+                matches.add(locale);
+            }
+        }
+        return matches;
+    }
 }

package/index.js

@@ -1,5 +1,3 @@
-"use strict";
-
 const path = require('path');
 
 module.exports = {

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "io.appium.settings",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "App for dealing with Android settings",
   "main": "index.js",
   "scripts": {
-    "bump-gradle-version": "gulp gradle-version-update --package-version=${npm_package_version} && git add app/build.gradle",
+    "bump-gradle-version": "node scripts/gradle-version-update.js --package-version=${npm_package_version} && git add app/build.gradle",
     "lint": "./gradlew lint",
+    "js:lint": "eslint .",
+    "js:lint:fix": "npm run lint -- --fix",
     "move-apks": "rm -rf apks && mkdir -p apks && cp app/build/outputs/apk/debug/settings_apk-debug.apk apks",
     "build": "./gradlew clean assembleDebug && npm run move-apks",
     "prepare": "npm run build",
@@ -16,6 +18,10 @@
     "type": "git",
     "url": "https://github.com/appium/io.appium.settings.git"
   },
+  "engines": {
+    "node": ">=14",
+    "npm": ">=8"
+  },
   "keywords": [
     "appium",
     "android",
@@ -33,16 +39,18 @@
     "!.DS_Store",
     "NOTICE.txt"
   ],
-  "author": "https://github.com/appium",
+  "author": "Appium Contributors",
   "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/appium/io.appium.settings/issues"
   },
   "homepage": "https://github.com/appium/io.appium.settings",
   "devDependencies": {
-    "@appium/gulp-plugins": "^7.0.0",
+    "@appium/eslint-config-appium": "^6.0.0",
+    "eslint": "^7.32.0",
+    "fancy-log": "^2.0.0",
     "@semantic-release/git": "^10.0.1",
-    "gulp": "^4.0.0",
-    "semantic-release": "^19.0.2"
+    "semantic-release": "^19.0.2",
+    "semver": "^7.3.7"
   }
 }