Fixes and improvements

lib/functions/check_app_updates.dart

@@ -14,7 +14,7 @@ Future<GitHubRelease?> checkAppUpdates({
 }) async {
   var result = isBeta 
     ? await ExternalRequests.getReleasesGitHub() 
-    : await ExternalRequests.getLatestReleaseGitHub();
+    : await ExternalRequests.getReleaseData();
 
   if (result.successful == true) {
     late GitHubRelease gitHubRelease;
@@ -30,7 +30,7 @@ Future<GitHubRelease?> checkAppUpdates({
       gitHubRelease: gitHubRelease,
       isBeta: isBeta
     );
-
+print(update);
     if (update == true) {
       setUpdateAvailable(gitHubRelease);
         

lib/providers/servers_provider.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:sqflite/sqflite.dart';
 
+import 'package:adguard_home_manager/models/github_release.dart';
 import 'package:adguard_home_manager/services/api_client.dart';
 import 'package:adguard_home_manager/services/external_requests.dart';
 import 'package:adguard_home_manager/models/server.dart';
@@ -188,9 +189,9 @@ class ServersProvider with ChangeNotifier {
     final result = await client!.checkServerUpdates();
     if (result.successful == true) {
       UpdateAvailableData data = UpdateAvailableData.fromJson(result.content);
-      final gitHubResult = await ExternalRequests.getUpdateChangelog(releaseTag: data.newVersion ?? data.currentVersion);
+      final gitHubResult = await ExternalRequests.getReleaseData(releaseTag: data.newVersion ?? data.currentVersion);
       if (gitHubResult.successful == true) {
-        data.changelog = gitHubResult.content;
+        data.changelog = (gitHubResult.content as GitHubRelease).body;
       }
       setUpdateAvailableData(data);
       setUpdateAvailableLoadStatus(LoadStatus.loaded, true);
@@ -262,7 +263,7 @@ class ServersProvider with ChangeNotifier {
             if (result.successful == true) {
               UpdateAvailableData data = UpdateAvailableData.fromJsonUpdate(result.content);
               if (data.currentVersion == data.newVersion) {
-                final gitHubResult = await ExternalRequests.getUpdateChangelog(releaseTag: data.newVersion ?? data.currentVersion);
+                final gitHubResult = await ExternalRequests.getReleaseData(releaseTag: data.newVersion ?? data.currentVersion);
                 if (gitHubResult.successful == true) {
                   data.changelog = gitHubResult.content;
                 }

lib/screens/clients/client/logs_list_client.dart

@@ -8,6 +8,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:adguard_home_manager/screens/logs/log_tile.dart';
 import 'package:adguard_home_manager/screens/logs/details/log_details_screen.dart';
 
+import 'package:adguard_home_manager/services/api_client.dart';
 import 'package:adguard_home_manager/functions/desktop_mode.dart';
 import 'package:adguard_home_manager/models/logs.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
@@ -21,13 +22,13 @@ class LogsListClient extends StatefulWidget {
   final bool splitView;
 
   const LogsListClient({
-    Key? key,
+    super.key,
     required this.ip,
     this.name,
     required this.serversProvider,
     required this.appConfigProvider,
     required this.splitView,
-  }) : super(key: key);
+  });
 
   @override
   State<LogsListClient> createState() => _LogsListClientState();
@@ -74,32 +75,28 @@ class _LogsListClientState extends State<LogsListClient> {
       )
     );
 
-    final result = await cancelableRequest?.value;
+    final result = await cancelableRequest?.value as ApiResponse;
+    if (!mounted) return;
 
-    if (result != null) {
+    if (loadingMore != null && loadingMore == true && mounted) {
-      if (loadingMore != null && loadingMore == true && mounted) {
+      setState(() => isLoadingMore = false);
-        setState(() => isLoadingMore = false);
+    }
-      }
 
-      if (mounted) {
+    if (result.successful == true) {
-        if (result['result'] == 'success') {
+      setState(() => offset = inOffset != null ? inOffset+logsQuantity : offset+logsQuantity);
-          setState(() => offset = inOffset != null ? inOffset+logsQuantity : offset+logsQuantity);
+      if (loadingMore != null && loadingMore == true && logsData != null) {
-          if (loadingMore != null && loadingMore == true && logsData != null) {
+        LogsData newLogsData = result.content;
-            LogsData newLogsData = result['data'];
+        newLogsData.data = [...logsData!.data, ...result.content.data];
-            newLogsData.data = [...logsData!.data, ...result['data'].data];
+        setState(() => logsData = newLogsData);
-            setState(() => logsData = newLogsData);
-          }
-          else {
-            LogsData newLogsData = result['data'];
-            setState(() => logsData = newLogsData);
-          }
-          setState(() => loadStatus = 1);
-        }
-        else {
-          setState(() => loadStatus = 2);
-          widget.appConfigProvider.addLog(result['log']);
-        }
       }
+      else {
+        LogsData newLogsData = result.content;
+        setState(() => logsData = newLogsData);
+      }
+      setState(() => loadStatus = 1);
+    }
+    else {
+      setState(() => loadStatus = 2);
     }
   }
 

lib/services/api_client.dart

@@ -689,10 +689,15 @@ class ApiClientV2 {
       server: server,
       body: data,
     );
-    return ApiResponse(
+    try {
-      successful: result.successful,
+      return ApiResponse(
-      content: result.body != null ? jsonDecode(result.body!) : null
+        successful: result.successful,
-    );
+        content: result.body != null ? jsonDecode(result.body!) : null
+      );
+    } catch (e, stackTrace) {
+      Sentry.captureException(e, stackTrace: stackTrace);
+      return const ApiResponse(successful: false);
+    }
   }
 
   Future<ApiResponse> saveEncryptionSettings({

lib/services/external_requests.dart

@@ -1,6 +1,6 @@
 import 'dart:convert';
-import 'dart:io';
 
+import 'package:http/http.dart' as http;
 import 'package:sentry_flutter/sentry_flutter.dart';
 
 import 'package:adguard_home_manager/models/github_release.dart';
@@ -8,72 +8,48 @@ import 'package:adguard_home_manager/constants/urls.dart';
 import 'package:adguard_home_manager/services/api_client.dart';
 
 class ExternalRequests {
-  static Future<ApiResponse> getUpdateChangelog({
-    required String releaseTag
-  }) async {
-    try {
-      HttpClient httpClient = HttpClient();
-      HttpClientRequest request = await httpClient.getUrl(Uri.parse("${Urls.adGuardHomeReleasesTags}/$releaseTag"));
-      HttpClientResponse response = await request.close();
-      String reply = await response.transform(utf8.decoder).join();
-      httpClient.close();
-      if (response.statusCode == 200) {
-        return ApiResponse(
-          successful: true,
-          content: jsonDecode(reply)['body'],
-          statusCode: response.statusCode
-        );
-      }
-      else {
-        return const ApiResponse(successful: false);
-      }    
-    } catch (e, stackTrace) {
-      Sentry.captureException(e, stackTrace: stackTrace);
-      return const ApiResponse(successful: false);
-    } 
-  }
-
   static Future<ApiResponse> getReleasesGitHub() async {
     try {
-      HttpClient httpClient = HttpClient();
+      final response = await http.get(Uri.parse(Urls.getReleasesGitHub));
-      HttpClientRequest request = await httpClient.getUrl(Uri.parse(Urls.getReleasesGitHub));
-      HttpClientResponse response = await request.close();
-      String reply = await response.transform(utf8.decoder).join();
-      httpClient.close();
       if (response.statusCode == 200) {
         return ApiResponse(
           successful: true,
-          content:  List<GitHubRelease>.from(jsonDecode(reply).map((entry) => GitHubRelease.fromJson(entry)))
+          content:  List<GitHubRelease>.from(
+            jsonDecode(response.body).map((entry) => GitHubRelease.fromJson(entry))
+          )
         );
       }
       else {
         return const ApiResponse(successful: false);
       }    
-    } catch (e, stackTrace) {
+    } catch (e) {
-      Sentry.captureException(e, stackTrace: stackTrace);
       return const ApiResponse(successful: false);
     } 
   }
 
-  static Future<ApiResponse> getLatestReleaseGitHub() async {
+  static Future<ApiResponse> getReleaseData({
+    // If releaseTag is null gets latest release
+    String? releaseTag
+  }) async {
     try {
-      HttpClient httpClient = HttpClient();
+      final response = await http.get(
-      HttpClientRequest request = await httpClient.getUrl(Uri.parse(Urls.getLatestReleaseGitHub));
+        Uri.parse(
-      HttpClientResponse response = await request.close();
+          releaseTag != null 
-      String reply = await response.transform(utf8.decoder).join();
+            ? "${Urls.adGuardHomeReleasesTags}/$releaseTag" 
-      httpClient.close();
+            : Urls.getLatestReleaseGitHub
+        )
+      );
       if (response.statusCode == 200) {
         return ApiResponse(
           successful: true,
-          content: GitHubRelease.fromJson(jsonDecode(reply)),
+          content: GitHubRelease.fromJson(jsonDecode(response.body)),
           statusCode: response.statusCode
         );
       }
       else {
         return const ApiResponse(successful: false);
       }    
-    } catch (e, stackTrace) {
+    } catch (e) {
-      Sentry.captureException(e, stackTrace: stackTrace);
       return const ApiResponse(successful: false);
     } 
   }

lib/widgets/layout.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:animations/animations.dart';
 import 'package:provider/provider.dart';
@@ -36,6 +37,7 @@ class _LayoutState extends State<Layout> with WidgetsBindingObserver {
     super.initState();
       
     WidgetsBinding.instance.addPostFrameCallback((_) async {
+      if (kDebugMode) return;   // Don't check for app updates on debug mode
       final appConfigProvider = Provider.of<AppConfigProvider>(context, listen: false);
       final result = await checkAppUpdates(
         currentBuildNumber: appConfigProvider.getAppInfo!.buildNumber,

pubspec.lock

@@ -319,7 +319,7 @@ packages:
     source: hosted
     version: "0.15.4"
   http:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http
       sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"

pubspec.yaml

@@ -75,6 +75,7 @@ dependencies:
   flutter_reorderable_list: ^1.3.1
   pie_chart: ^5.4.0
   segmented_button_slide: ^1.0.4
+  http: ^1.1.0
 
 dev_dependencies:
   flutter_test: