Merge branch 'pass-language-code-to-itunes-search'

larryaasen · Sep 3, 2024 · b09ba54 · b09ba54
2 parents fa02d08 + f81875d
commit b09ba54
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 8 deletions.
diff --git a/lib/src/itunes_search_api.dart b/lib/src/itunes_search_api.dart
@@ -32,14 +32,18 @@ class ITunesSearchAPI {
   /// ```lookupURLByBundleId('com.google.Maps');```
   /// ```lookupURLByBundleId('com.google.Maps', country: 'FR');```
   Future<Map?> lookupByBundleId(String bundleId,
-      {String? country = 'US', bool useCacheBuster = true}) async {
+      {String? country = 'US',
+      String? language = 'en',
+      bool useCacheBuster = true}) async {
     assert(bundleId.isNotEmpty);
     if (bundleId.isEmpty) {
       return null;
     }
 
     final url = lookupURLByBundleId(bundleId,
-        country: country ?? '', useCacheBuster: useCacheBuster)!;
+        country: country ?? '',
+        language: language ?? '',
+        useCacheBuster: useCacheBuster)!;
     if (debugLogging) {
       print('upgrader: download: $url');
     }
@@ -94,14 +98,18 @@ class ITunesSearchAPI {
   /// ```lookupURLByBundleId('com.google.Maps');```
   /// ```lookupURLByBundleId('com.google.Maps', country: 'FR');```
   String? lookupURLByBundleId(String bundleId,
-      {String country = 'US', bool useCacheBuster = true}) {
+      {String country = 'US',
+      String language = 'en',
+      bool useCacheBuster = true}) {
     if (bundleId.isEmpty) {
       return null;
     }
 
-    return lookupURLByQSP(
-        {'bundleId': bundleId, 'country': country.toUpperCase()},
-        useCacheBuster: useCacheBuster);
+    return lookupURLByQSP({
+      'bundleId': bundleId,
+      'country': country.toUpperCase(),
+      'lang': language
+    }, useCacheBuster: useCacheBuster);
   }
 
   /// Look up URL by id.

diff --git a/lib/src/upgrader.dart b/lib/src/upgrader.dart
@@ -239,6 +239,37 @@ class Upgrader with WidgetsBindingObserver {
         state.countryCodeOverride ?? findCountryCode(locale: locale);
     if (state.debugLogging) {
       print('upgrader: countryCode: $country');
+      // The  language code of the locale, defaulting to `en`.
+      final language = languageCode ?? findLanguageCode();
+      if (debugLogging) {
+        print('upgrader: languageCode: $language');
+      }
+
+      // Get Android version from Google Play Store, or
+      // get iOS version from iTunes Store.
+      if (upgraderOS.isAndroid) {
+        await _getAndroidStoreVersion(country: country, language: language);
+      } else if (upgraderOS.isIOS) {
+        final iTunes = ITunesSearchAPI();
+        iTunes.debugLogging = debugLogging;
+        iTunes.client = client;
+        final response = await (iTunes
+            .lookupByBundleId(_packageInfo!.packageName, language: language,
+            country:country));
+
+        if (response != null) {
+          _appStoreVersion = iTunes.version(response);
+          _appStoreListingURL = iTunes.trackViewUrl(response);
+          _releaseNotes ??= iTunes.releaseNotes(response);
+          final mav = iTunes.minAppVersion(response);
+          if (mav != null) {
+            minAppVersion = mav.toString();
+            if (debugLogging) {
+              print('upgrader: ITunesResults.minAppVersion: $minAppVersion');
+            }
+          }
+        }
+      }
     }
 
     // Determine the language code of the locale, defaulting to `en`.

diff --git a/test/itunes_test.dart b/test/itunes_test.dart
@@ -20,7 +20,12 @@ void main() {
     expect(
         iTunes.lookupURLByBundleId('com.google.Maps', useCacheBuster: false),
         equals(
-            'https://itunes.apple.com/lookup?bundleId=com.google.Maps&country=US'));
+            'https://itunes.apple.com/lookup?bundleId=com.google.Maps&country=US&lang=en'));
+    expect(
+        iTunes.lookupURLByBundleId('com.google.Maps',
+            useCacheBuster: false, language: 'ar'),
+        equals(
+            'https://itunes.apple.com/lookup?bundleId=com.google.Maps&country=US&lang=ar'));
     expect(iTunes.lookupURLById('585027354', useCacheBuster: false),
         equals('https://itunes.apple.com/lookup?id=585027354&country=US'));
     expect(
@@ -30,7 +35,7 @@ void main() {
 
     // Test the URL using the cache buster and remove it from the URL
     const testUrl =
-        'https://itunes.apple.com/lookup?bundleId=com.google.Maps&country=US&_cb=';
+        'https://itunes.apple.com/lookup?bundleId=com.google.Maps&country=US&lang=en&_cb=';
     final url = iTunes
         .lookupURLByBundleId('com.google.Maps', useCacheBuster: true)!
         .substring(0, testUrl.length);