From a63427c16dc1d4f43977c9c747691a2a68c39f8f Mon Sep 17 00:00:00 2001
From: Vincent Velociter <vincent.velociter@gmail.com>
Date: Sat, 3 Aug 2024 12:11:28 +0200
Subject: [PATCH] Don't use not recommended runWithClient

Closes #850
---
 android/fastlane/Fastfile       |  2 +-
 lib/main.dart                   |  8 +-------
 lib/src/app_initialization.dart | 29 ++++++++++-------------------
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
index 1446009058..63d6088225 100644
--- a/android/fastlane/Fastfile
+++ b/android/fastlane/Fastfile
@@ -30,7 +30,7 @@ platform :android do
 end
 
 def deploy_to_play_store(track)
-  sh "flutter build appbundle -v --obfuscate --split-debug-info=./build/app/outputs/bundle/release/symbols --dart-define=cronetHttpNoPlay=true --dart-define=no_default_http_client=true --dart-define=LICHESS_HOST=lichess.org --dart-define=LICHESS_WS_HOST=socket.lichess.org --dart-define=LICHESS_WS_SECRET=#{ENV['WS_SECRET']}"
+  sh "flutter build appbundle -v --obfuscate --split-debug-info=./build/app/outputs/bundle/release/symbols --dart-define=cronetHttpNoPlay=true --dart-define=LICHESS_HOST=lichess.org --dart-define=LICHESS_WS_HOST=socket.lichess.org --dart-define=LICHESS_WS_SECRET=#{ENV['WS_SECRET']}"
   upload_to_play_store(
     track: track,
     aab: '../build/app/outputs/bundle/release/app-release.aab',
diff --git a/lib/main.dart b/lib/main.dart
index b6cc77c1af..982f02c275 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -9,11 +9,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:http/http.dart';
 import 'package:lichess_mobile/src/db/database.dart';
 import 'package:lichess_mobile/src/intl.dart';
 import 'package:lichess_mobile/src/log.dart';
-import 'package:lichess_mobile/src/model/common/http.dart';
 import 'package:lichess_mobile/src/model/common/id.dart';
 import 'package:lichess_mobile/src/model/correspondence/correspondence_game_storage.dart';
 import 'package:lichess_mobile/src/model/correspondence/offline_correspondence_game.dart';
@@ -28,11 +26,7 @@ import 'firebase_options.dart';
 import 'src/app.dart';
 import 'src/utils/color_palette.dart';
 
-void main() {
-  runWithClient(_startFlutterApp, httpClientFactory);
-}
-
-Future<void> _startFlutterApp() async {
+Future<void> main() async {
   final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
 
   // logging setup
diff --git a/lib/src/app_initialization.dart b/lib/src/app_initialization.dart
index f85be3f05f..61b600704a 100644
--- a/lib/src/app_initialization.dart
+++ b/lib/src/app_initialization.dart
@@ -102,25 +102,16 @@ Future<AppInitializationData> appInitialization(
 
   final storedSession = await sessionStorage.read();
   if (storedSession != null) {
-    final client = httpClientFactory();
-    try {
-      final response = await client.get(
-        lichessUri('/api/account'),
-        headers: {
-          'Authorization': 'Bearer ${signBearerToken(storedSession.token)}',
-          'User-Agent':
-              makeUserAgent(pInfo, deviceInfo, sri, storedSession.user),
-        },
-      ).timeout(const Duration(seconds: 3));
-      if (response.statusCode == 401) {
-        await sessionStorage.delete();
-      }
-    } catch (e) {
-      debugPrint(
-        'WARNING: [AppInitialization] Error while checking session: $e',
-      );
-    } finally {
-      client.close();
+    final client = ref.read(defaultClientProvider);
+    final response = await client.get(
+      lichessUri('/api/account'),
+      headers: {
+        'Authorization': 'Bearer ${signBearerToken(storedSession.token)}',
+        'User-Agent': makeUserAgent(pInfo, deviceInfo, sri, storedSession.user),
+      },
+    ).timeout(const Duration(seconds: 3));
+    if (response.statusCode == 401) {
+      await sessionStorage.delete();
     }
   }