style: Removed unnecessary appearances (#330)

openfoodfacts · Dec 17, 2021 · 8910b5a · 8910b5a
1 parent 5f9447c
commit 8910b5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/lib/openfoodfacts.dart b/lib/openfoodfacts.dart
@@ -21,7 +21,6 @@ import 'package:openfoodfacts/utils/AbstractQueryConfiguration.dart';
 import 'package:openfoodfacts/utils/CountryHelper.dart';
 import 'package:openfoodfacts/utils/ImageHelper.dart';
 import 'package:openfoodfacts/utils/OcrField.dart';
-import 'package:openfoodfacts/utils/OpenFoodAPIConfiguration.dart';
 import 'package:openfoodfacts/utils/PnnsGroupQueryConfiguration.dart';
 import 'package:openfoodfacts/utils/PnnsGroups.dart';
 import 'package:openfoodfacts/utils/ProductListQueryConfiguration.dart';
@@ -169,7 +168,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       productUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     var result = ProductResult.fromJson(json.decode(response.body));
@@ -196,7 +194,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       productUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     final jsonStr = _replaceQuotes(response.body);
@@ -256,7 +253,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       searchUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     final jsonStr = _replaceQuotes(response.body);
@@ -282,7 +278,6 @@ class OpenFoodAPIClient {
     final Response response = await HttpHelper().doGetRequest(
       uri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
 
@@ -311,7 +306,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       searchUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     final jsonStr = _replaceQuotes(response.body);
@@ -332,7 +326,6 @@ class OpenFoodAPIClient {
     final Response response = await HttpHelper().doGetRequest(
       uri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
 
@@ -462,7 +455,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       insightUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     var result =
@@ -484,7 +476,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       insightsUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
 
@@ -517,7 +508,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       robotoffQuestionUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     var result = RobotoffQuestionResult.fromJson(
@@ -559,7 +549,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       robotoffQuestionUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     var result = RobotoffQuestionResult.fromJson(
@@ -629,7 +618,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       spellingCorrectionUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     SpellingCorrection result = SpellingCorrection.fromJson(
@@ -663,7 +651,6 @@ class OpenFoodAPIClient {
     Response response = await HttpHelper().doGetRequest(
       ocrUri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
 
@@ -693,7 +680,6 @@ class OpenFoodAPIClient {
 
     Response response = await HttpHelper().doGetRequest(
       suggestionUri,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
 
@@ -848,7 +834,6 @@ class OpenFoodAPIClient {
     try {
       final Response response = await HttpHelper().doGetRequest(
         uri,
-        userAgent: OpenFoodAPIConfiguration.userAgent,
         queryType: queryType,
       );
       if (response.statusCode != 200) {
@@ -888,7 +873,6 @@ class OpenFoodAPIClient {
     try {
       final Response response = await HttpHelper().doGetRequest(
         uri,
-        userAgent: OpenFoodAPIConfiguration.userAgent,
         queryType: queryType,
       );
       if (response.statusCode != 200) {
@@ -922,7 +906,6 @@ class OpenFoodAPIClient {
 
     final Response response = await HttpHelper().doGetRequest(
       uri,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     if (response.statusCode != 200) {
@@ -1028,7 +1011,6 @@ class OpenFoodAPIClient {
     final Response response = await HttpHelper().doGetRequest(
       uri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     if (response.statusCode != 200) {
@@ -1079,7 +1061,6 @@ class OpenFoodAPIClient {
     final Response response = await HttpHelper().doGetRequest(
       uri,
       user: user,
-      userAgent: OpenFoodAPIConfiguration.userAgent,
       queryType: queryType,
     );
     if (response.statusCode != 200) {

diff --git a/lib/utils/HttpHelper.dart b/lib/utils/HttpHelper.dart
@@ -1,13 +1,12 @@
-import 'package:meta/meta.dart';
+import 'dart:async';
+import 'dart:convert';
+
 import 'package:http/http.dart' as http;
-import 'package:openfoodfacts/model/UserAgent.dart';
+import 'package:meta/meta.dart';
 import 'package:openfoodfacts/openfoodfacts.dart';
 import 'package:openfoodfacts/utils/UriReader.dart';
 import 'package:path/path.dart';
 
-import 'dart:async';
-import 'dart:convert';
-
 import 'OpenFoodAPIConfiguration.dart';
 import 'QueryType.dart';
 
@@ -36,14 +35,12 @@ class HttpHelper {
   Future<http.Response> doGetRequest(
     Uri uri, {
     User? user,
-    UserAgent? userAgent,
     QueryType? queryType,
   }) async {
     http.Response response = await http.get(
       uri,
       headers: _buildHeaders(
         user: user,
-        userAgent: userAgent,
         isTestModeActive:
             OpenFoodAPIConfiguration.getQueryType(queryType) == QueryType.PROD
                 ? false
@@ -136,14 +133,14 @@ class HttpHelper {
   /// By default isTestMode is false
   Map<String, String>? _buildHeaders({
     User? user,
-    UserAgent? userAgent,
     bool isTestModeActive = false,
   }) {
     Map<String, String>? headers = {};
 
     headers.addAll({
       'Accept': 'application/json',
-      'UserAgent': userAgent != null ? userAgent.toValueString() : USER_AGENT,
+      'UserAgent':
+          OpenFoodAPIConfiguration.userAgent?.toValueString() ?? USER_AGENT,
       'From': (user != null) ? user.userId : FROM,
     });