Merge branch 'beta'

lib/providers/dns_provider.dart

@@ -66,7 +66,7 @@ class DnsProvider with ChangeNotifier {
     if (result['result'] == 'success') {
       DnsInfo data = dnsInfo!;
       if (value['local_ptr_upstreams'] != null) {
-        data.localPtrUpstreams = value['local_ptr_upsreams'];
+        data.localPtrUpstreams = value['local_ptr_upstreams'];
       }
       data.usePrivatePtrResolvers = value['use_private_ptr_resolvers'];
       data.resolveClients = value['resolve_clients'];

lib/providers/logs_provider.dart

@@ -146,8 +146,7 @@ class LogsProvider with ChangeNotifier {
   }) async {
     int offst = inOffset ?? offset;
 
-    String resStatus = responseStatus ?? selectedResultStatus;
-    String? search = searchText ?? searchText;
+    String resStatus = responseStatus ?? _selectedResultStatus;
 
     if (loadingMore != null && loadingMore == true) {
       _isLoadingMore = true;
@@ -159,7 +158,7 @@ class LogsProvider with ChangeNotifier {
       offset: offst,
       olderThan: logsOlderThan,
       responseStatus: resStatus,
-      search: search
+      search: _searchText
     );
 
     if (loadingMore != null && loadingMore == true) {

lib/screens/home/top_items.dart

@@ -3,7 +3,6 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -12,12 +11,10 @@ import 'package:adguard_home_manager/screens/top_items/top_items_modal.dart';
 import 'package:adguard_home_manager/screens/top_items/top_items.dart';
 
 import 'package:adguard_home_manager/models/applied_filters.dart';
-import 'package:adguard_home_manager/functions/snackbar.dart';
 import 'package:adguard_home_manager/providers/status_provider.dart';
-import 'package:adguard_home_manager/models/menu_option.dart';
 import 'package:adguard_home_manager/providers/logs_provider.dart';
-import 'package:adguard_home_manager/classes/process_modal.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
+
 class TopItems extends StatelessWidget {
   final String type;
   final String label;
@@ -40,79 +37,6 @@ class TopItems extends StatelessWidget {
 
     final width = MediaQuery.of(context).size.width;
 
-    bool? getIsBlocked() {
-      if (type == 'topBlockedDomains') {
-        return true;
-      }
-      else if (type == 'topQueriedDomains') {
-        return false;
-      }
-      else {
-        return null;
-      }
-    }
-
-    void blockUnblock(String domain, String newStatus) async {
-      final ProcessModal processModal = ProcessModal(context: context);
-      processModal.open(AppLocalizations.of(context)!.savingUserFilters);
-
-      final rules = await statusProvider.blockUnblockDomain(
-        domain: domain,
-        newStatus: newStatus
-      );
-
-      processModal.close();
-
-      if (rules == true) {
-        showSnacbkar(
-          appConfigProvider: appConfigProvider, 
-          label: AppLocalizations.of(context)!.userFilteringRulesUpdated, 
-          color: Colors.green
-        );
-      }
-      else {
-        showSnacbkar(
-          appConfigProvider: appConfigProvider, 
-          label: AppLocalizations.of(context)!.userFilteringRulesNotUpdated, 
-          color: Colors.red
-          
-        );
-      }
-    }
-
-    void copyDomainClipboard(String domain) async {
-      await Clipboard.setData(
-        ClipboardData(text: domain)
-      );
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(AppLocalizations.of(context)!.domainCopiedClipboard),
-          backgroundColor: Colors.green,
-        )
-      );
-    }
-
-    List<MenuOption> generateOptions(String domain) {
-      final isBlocked = getIsBlocked();
-      return [
-        if (isBlocked == true) MenuOption(
-          title: AppLocalizations.of(context)!.unblock, 
-          icon: Icons.check,
-          action: () => blockUnblock(domain, 'unblock')
-        ),
-        if (isBlocked == false) MenuOption(
-          title: AppLocalizations.of(context)!.block, 
-          icon: Icons.check,
-          action: () => blockUnblock(domain, 'block')
-        ),
-        MenuOption(
-          title: AppLocalizations.of(context)!.copyClipboard, 
-          icon: Icons.check,
-          action: () => copyDomainClipboard(domain)
-        ),
-      ];
-    }
-
     Widget rowItem(Map<String, dynamic> item) {
       String? name;
       if (clients != null && clients == true) {

lib/screens/logs/logs.dart

@@ -390,7 +390,7 @@ class _LogsState extends State<Logs> {
                         const SizedBox(width: 15),
                         Chip(
                           avatar: const Icon(
-                            Icons.link_rounded,
+                            Icons.search_rounded,
                           ),
                           label: Row(
                             children: [

lib/services/http_requests.dart

@@ -2025,11 +2025,11 @@ class ApiClient {
       ),
     ]);
 
-    if (result[0]['hasResponse'] == true && result[0]['hasResponse'] == true) {
-      if (result[0]['statusCode'] == 200 && result[0]['statusCode'] == 200) {
+    if (result[0]['hasResponse'] == true && result[1]['hasResponse'] == true) {
+      if (result[0]['statusCode'] == 200 && result[1]['statusCode'] == 200) {
         final Map<String, dynamic> obj = {
           ...jsonDecode(result[0]['body']),
-          'current_version': jsonDecode(result[1]['body'])['version']
+          'current_version': ServerInfoData.fromJson(jsonDecode(result[1]['body'])).version
         };
         return {
           'result': 'success',