luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-16 23:12:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced old http service with new one

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-20 15:00:07 +01:00
parent 39cdcf648d
commit 48f33eee9b
14 changed files with 466 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/providers/dns_provider.dart
View file

@ -42,10 +42,10 @@ class DnsProvider with ChangeNotifier {
_loadStatus = LoadStatus.loading;
}
final result = await _serversProvider!.apiClient!.getDnsInfo();
final result = await _serversProvider!.apiClient2!.getDnsInfo();
if (result['result'] == 'success') {
_dnsInfo = result['data'];
if (result.successful == true) {
_dnsInfo = result.content as DnsInfo;
_loadStatus = LoadStatus.loaded;
notifyListeners();
return true;

22
lib/providers/logs_provider.dart
View file

@ -153,7 +153,7 @@ class LogsProvider with ChangeNotifier {
notifyListeners();
}
final result = await _serversProvider!.apiClient!.getLogs(
final result = await _serversProvider!.apiClient2!.getLogs(
count: logsQuantity,
offset: offst,
olderThan: logsOlderThan,
@ -166,11 +166,11 @@ class LogsProvider with ChangeNotifier {
notifyListeners();
}
if (result['result'] == 'success') {
if (result.successful == true) {
_offset = inOffset != null ? inOffset+logsQuantity : offset+logsQuantity;
if (loadingMore != null && loadingMore == true && logsData != null) {
LogsData newLogsData = result['data'];
newLogsData.data = [...logsData!.data, ...result['data'].data];
LogsData newLogsData = result.content;
newLogsData.data = [...logsData!.data, ...(result.content as LogsData).data];
if (appliedFilters.clients != null) {
newLogsData.data = newLogsData.data.where(
(item) => appliedFilters.clients!.contains(item.client)
@ -179,7 +179,7 @@ class LogsProvider with ChangeNotifier {
_logsData = newLogsData;
}
else {
LogsData newLogsData = result['data'];
LogsData newLogsData = result.content;
if (appliedFilters.clients != null) {
newLogsData.data = newLogsData.data.where(
(item) => appliedFilters.clients!.contains(item.client)
@ -204,7 +204,7 @@ class LogsProvider with ChangeNotifier {
resetFilters();
final result = await _serversProvider!.apiClient!.getLogs(
final result = await _serversProvider!.apiClient2!.getLogs(
count: logsQuantity
);
@ -214,8 +214,8 @@ class LogsProvider with ChangeNotifier {
clients: null
);
if (result['result'] == 'success') {
_logsData = result['data'];
if (result.successful == true) {
_logsData = result.content as LogsData;
_loadStatus = LoadStatus.loaded;
notifyListeners();
return true;
@ -233,7 +233,7 @@ class LogsProvider with ChangeNotifier {
setOffset(0);
final result = await _serversProvider!.apiClient!.getLogs(
final result = await _serversProvider!.apiClient2!.getLogs(
count: logsQuantity,
olderThan: logsOlderThan,
responseStatus: selectedResultStatus,
@ -246,8 +246,8 @@ class LogsProvider with ChangeNotifier {
clients: selectedClients
);
if (result['result'] == 'success') {
LogsData newLogsData = result['data'];
if (result.successful == true) {
LogsData newLogsData = result.content as LogsData;
if (appliedFilters.clients != null) {
newLogsData.data = newLogsData.data.where(
(item) => appliedFilters.clients!.contains(item.client)

40
lib/providers/servers_provider.dart
View file

@ -7,7 +7,6 @@ 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';
import 'package:adguard_home_manager/models/update_available.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:adguard_home_manager/functions/conversions.dart';
import 'package:adguard_home_manager/services/db/queries.dart';
import 'package:adguard_home_manager/constants/enums.dart';
@ -17,7 +16,7 @@ class ServersProvider with ChangeNotifier {
List<Server> _serversList = [];
Server? _selectedServer;
ApiClient? _apiClient;
// ApiClient? _apiClient;
ApiClientV2? _apiClient2;
bool _updatingServer = false;
@ -27,9 +26,9 @@ class ServersProvider with ChangeNotifier {
data: null,
);
ApiClient? get apiClient {
return _apiClient;
}
// ApiClient? get apiClient {
// return _apiClient;
// }
ApiClientV2? get apiClient2 {
return _apiClient2;
@ -77,10 +76,10 @@ class ServersProvider with ChangeNotifier {
notifyListeners();
}
void setApiClient(ApiClient client) {
_apiClient = client;
notifyListeners();
}
// void setApiClient(ApiClient client) {
// _apiClient = client;
// notifyListeners();
// }
void setApiClient2(ApiClientV2 client) {
_apiClient2 = client;
@ -153,7 +152,8 @@ class ServersProvider with ChangeNotifier {
_serversList = newServers;
if (selectedServer != null &&server.id == selectedServer!.id) {
_apiClient = ApiClient(server: server);
// _apiClient = ApiClient(server: server);
_apiClient2 = ApiClientV2(server: server);
}
notifyListeners();
@ -168,7 +168,7 @@ class ServersProvider with ChangeNotifier {
final result = await removeServerQuery(_dbInstance!, server.id);
if (result == true) {
_selectedServer = null;
_apiClient = null;
// _apiClient = null;
List<Server> newServers = _serversList.where((s) => s.id != server.id).toList();
_serversList = newServers;
notifyListeners();
@ -181,13 +181,13 @@ class ServersProvider with ChangeNotifier {
void checkServerUpdatesAvailable({
required Server server,
ApiClient? apiClient
ApiClientV2? apiClient
}) async {
final client = apiClient ?? _apiClient;
final client = apiClient ?? _apiClient2;
setUpdateAvailableLoadStatus(LoadStatus.loading, true);
final result = await client!.checkServerUpdates();
if (result['result'] == 'success') {
UpdateAvailableData data = UpdateAvailableData.fromJson(result['data']);
if (result.successful == true) {
UpdateAvailableData data = UpdateAvailableData.fromJson(result.content);
final gitHubResult = await ExternalRequests.getUpdateChangelog(releaseTag: data.newVersion ?? data.currentVersion);
if (gitHubResult.successful == true) {
data.changelog = gitHubResult.content;
@ -200,12 +200,12 @@ class ServersProvider with ChangeNotifier {
}
}
Future initializateServer(Server server, ApiClient apiClient, ApiClientV2 apiClient2) async {
Future initializateServer(Server server, /*ApiClient apiClient, */ ApiClientV2 apiClient2) async {
final serverStatus = await _apiClient2!.getServerStatus();
if (serverStatus.successful == true) {
checkServerUpdatesAvailable( // Do not await
server: server,
apiClient: apiClient
apiClient: apiClient2
);
}
}
@ -237,11 +237,11 @@ class ServersProvider with ChangeNotifier {
if (defaultServer != null) {
_selectedServer = defaultServer;
final client = ApiClient(server: defaultServer);
// final client = ApiClient(server: defaultServer);
final client2 = ApiClientV2(server: defaultServer);
_apiClient = client;
// _apiClient = client;
_apiClient2 = client2;
initializateServer(defaultServer, client, client2);
initializateServer(defaultServer, /*client,*/ client2);
}
}
else {

4
lib/providers/status_provider.dart
View file

@ -149,13 +149,13 @@ class StatusProvider with ChangeNotifier {
_protectionsManagementProcess.add('filtering');
notifyListeners();
final result = await _serversProvider!.apiClient!.updateFiltering(
final result = await _serversProvider!.apiClient2!.updateFiltering(
enable: newStatus,
);
_protectionsManagementProcess = _protectionsManagementProcess.where((e) => e != 'filtering').toList();
if (result['result'] == 'success') {
if (result.successful == true) {
_serverStatus!.filteringEnabled = newStatus;
notifyListeners();
return true;