[feat] Send isoCountryCode to location in putLocation request (#1280)

* ✨ feat: send isoCountryCode to location in putLocation request

* 🥅 feat: catch API request error

* ➖ chore: remove location and s2geometry dependencies

* 🔥 chore: remove additional location permission artifacts

* 💚 chore: remove dependencies from en lock files

Author: hspinks

client/app_en/ios/Podfile.lock

@@ -99,10 +99,6 @@ PODS:
     - GoogleUtilities/Logger
   - GoogleUtilities/UserDefaults (6.5.2):
     - GoogleUtilities/Logger
-  - location (0.0.1):
-    - Flutter
-  - location_web (0.0.1):
-    - Flutter
   - nanopb (0.3.9011):
     - nanopb/decode (= 0.3.9011)
     - nanopb/encode (= 0.3.9011)
@@ -142,8 +138,6 @@ DEPENDENCIES:
   - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
-  - location (from `.symlinks/plugins/location/ios`)
-  - location_web (from `.symlinks/plugins/location_web/ios`)
   - notification_permissions (from `.symlinks/plugins/notification_permissions/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
@@ -190,10 +184,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
     :path: Flutter
-  location:
-    :path: ".symlinks/plugins/location/ios"
-  location_web:
-    :path: ".symlinks/plugins/location_web/ios"
   notification_permissions:
     :path: ".symlinks/plugins/notification_permissions/ios"
   package_info:
@@ -241,8 +231,6 @@ SPEC CHECKSUMS:
   GoogleDataTransport: b29a21d813e906014ca16c00897827e40e4a24ab
   GoogleDataTransportCCTSupport: 6f15a89b0ca35d6fa523e1f752ef818588885988
   GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e
-  location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
-  location_web: b94e7433cfe28c0f7c8923c2ee482824b32e55a7
   nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
   notification_permissions: b74860c2967c1579243a675e63cd55e0ae75cef7
   package_info: 48b108e75b8802c2d5e126f208ef540561c98aef

client/app_en/pubspec.lock

@@ -217,34 +217,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.16.1"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.6.1+1"
-  location:
-    dependency: transitive
-    description:
-      name: location
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.2"
-  location_platform_interface:
-    dependency: transitive
-    description:
-      name: location_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
-  location_web:
-    dependency: transitive
-    description:
-      name: location_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
   matcher:
     dependency: transitive
     description:
@@ -357,13 +329,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
-  s2geometry:
-    dependency: transitive
-    description:
-      name: s2geometry
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.1"
   share:
     dependency: transitive
     description:

client/flutter/android/app/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
-  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <application android:name="io.flutter.app.FlutterApplication" android:label="COVID-19" android:icon="@mipmap/ic_launcher">
     <activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as

client/flutter/ios/Podfile.lock

@@ -97,10 +97,6 @@ PODS:
     - GoogleUtilities/Logger
   - GoogleUtilities/UserDefaults (6.5.2):
     - GoogleUtilities/Logger
-  - location (0.0.1):
-    - Flutter
-  - location_web (0.0.1):
-    - Flutter
   - nanopb (0.3.9011):
     - nanopb/decode (= 0.3.9011)
     - nanopb/encode (= 0.3.9011)
@@ -139,8 +135,6 @@ DEPENDENCIES:
   - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
-  - location (from `.symlinks/plugins/location/ios`)
-  - location_web (from `.symlinks/plugins/location_web/ios`)
   - notification_permissions (from `.symlinks/plugins/notification_permissions/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
@@ -185,10 +179,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
     :path: Flutter
-  location:
-    :path: ".symlinks/plugins/location/ios"
-  location_web:
-    :path: ".symlinks/plugins/location_web/ios"
   notification_permissions:
     :path: ".symlinks/plugins/notification_permissions/ios"
   package_info:
@@ -235,8 +225,6 @@ SPEC CHECKSUMS:
   GoogleDataTransport: b29a21d813e906014ca16c00897827e40e4a24ab
   GoogleDataTransportCCTSupport: 6f15a89b0ca35d6fa523e1f752ef818588885988
   GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e
-  location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
-  location_web: b94e7433cfe28c0f7c8923c2ee482824b32e55a7
   nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
   notification_permissions: b74860c2967c1579243a675e63cd55e0ae75cef7
   package_info: 48b108e75b8802c2d5e126f208ef540561c98aef

client/flutter/ios/Runner/Info.plist

@@ -12,12 +12,6 @@
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>WHO COVID-19</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Your location is used to deliver you the most relevant information and push notifications to your area.</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Your location is used to deliver you the most relevant information and push notifications to your area.</string>
-	<key>NSLocationAlwaysAndWhenInUsageDescription</key>
-	<string>Your location is used to deliver you the most relevant information and push notifications to your area.</string>
 	<key>CFBundleDisplayName</key>
 	<string>COVID–19</string>
 	<key>CFBundlePackageType</key>

client/flutter/lib/api/who_service.dart

@@ -23,10 +23,10 @@ class WhoService {
   }
 
   /// Put location
-  static Future<bool> putLocation({String s2CellIdToken}) async {
+  static Future<bool> putLocation({String isoCountryCode}) async {
     Map<String, String> headers = await _getHeaders();
     var postBody = jsonEncode({
-      "s2CellIdToken": s2CellIdToken,
+      "isoCountryCode": isoCountryCode,
     });
     var url = '$serviceUrl/putLocation';
     var response = await http.post(url, headers: headers, body: postBody);

client/flutter/lib/main.dart

@@ -37,6 +37,9 @@ void mainImpl({@required Map<String, WidgetBuilder> routes}) async {
   final bool onboardingComplete =
       await UserPreferences().getOnboardingCompleted();
 
+  // Comment the above lines out and uncomment this to force onboarding in development
+  // final bool onboardingComplete = false;
+
   // Set `enableInDevMode` to true to see reports while in debug mode
   // This is only to be used for confirming that reports are being
   // submitted as expected. It is not intended to be used for everyday

client/flutter/lib/pages/onboarding/location_sharing_page.dart

@@ -1,5 +1,6 @@
 import 'package:who_app/api/iso_country.dart';
 import 'package:who_app/api/user_preferences.dart';
+import 'package:who_app/api/who_service.dart';
 import 'package:who_app/pages/onboarding/country_list_page.dart';
 import 'package:who_app/pages/onboarding/country_select_page.dart';
 import 'package:who_app/pages/onboarding/legal_landing_page.dart';
@@ -103,6 +104,11 @@ class _OnboardingPageState extends State<OnboardingPage> {
       _showCountryListPage = false;
     });
     await _toNextPage();
+    try {
+      await WhoService.putLocation(isoCountryCode: _selectedCountry.alpha2Code);
+    } catch (error) {
+      print('Error sending location to API: $error');
+    }
   }
 
   Future<void> _onLegalDone() async {

client/flutter/lib/pages/onboarding/onboarding_page.dart

@@ -210,34 +210,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.16.1"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.6.1+1"
-  location:
-    dependency: "direct main"
-    description:
-      name: location
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.2"
-  location_platform_interface:
-    dependency: transitive
-    description:
-      name: location_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
-  location_web:
-    dependency: transitive
-    description:
-      name: location_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
   matcher:
     dependency: transitive
     description:
@@ -350,13 +322,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
-  s2geometry:
-    dependency: "direct main"
-    description:
-      name: s2geometry
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.1"
   share:
     dependency: "direct main"
     description: