luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-04-24 07:46:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'beta'

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-23 02:15:18 +01:00
commit b2f337ead5
10 changed files with 182 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
.github/workflows/release-beta.yaml vendored
View file

@ -2,19 +2,9 @@ name: Compile and release beta build
on:
workflow_dispatch:
inputs:
version:
description: "Version"
required: true
default: "1.0.0"
beta-number:
description: "Beta number"
required: true
default: "1"
number:
description: "Build number"
required: true
default: "1"
branches:
- beta
jobs:
build-android:
name: Build Android .apk and .aab
@ -22,7 +12,6 @@ jobs:
env:
ANDROID_AAB_RELEASE_PATH: build/app/outputs/bundle/release
ANDROID_APK_RELEASE_PATH: build/app/outputs/apk/release
VERSION_NAME: ${{ github.event.inputs.version }}-beta.${{ github.event.inputs.beta-number }}
steps:
- uses: actions/checkout@v3
with:
@ -33,8 +22,23 @@ jobs:
run: echo "${{ secrets.KEY_PROPERTIES }}" | base64 --decode > android/key.properties
- name: Decode .env
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
- name: Update version in YAML
run: sed -i 's/99.99.99+99/${{ env.VERSION_NAME }}+${{ github.event.inputs.number }}/g' pubspec.yaml
- name: Read pubspec.yaml
uses: jbutcher5/read-yaml@1.6
id: read_pubspec
with:
file: './pubspec.yaml'
key-path: '["version"]'
- name: Split version string
uses: winterjung/split@v2
id: splitted_version
with:
msg: "${{ steps.read_pubspec.outputs.data }}"
separator: "+"
- name: Save version on env variable
run: |
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
- name: Update KeyStore password in gradle properties
run: sed -i 's/#{KEYSTORE_PASS}#/${{ secrets.KEYSTORE_PASS }}/g' android/key.properties
- name: Update KeyStore key password in gradle properties
@ -69,8 +73,9 @@ jobs:
name: Release beta build to GitHub
runs-on: ubuntu-latest
needs: [build-android]
env:
VERSION_NAME: ${{ github.event.inputs.version }}-beta.${{ github.event.inputs.beta-number }}
env:
VERSION_NAME: ${{ needs.build-android.outputs.version_name }}
VERSION_NUMBER: ${{ needs.build-android.outputs.version_number }}
steps:
- uses: actions/checkout@v3
with:
@ -87,7 +92,7 @@ jobs:
with:
artifacts: "releases/*"
token: ${{ secrets.GH_TOKEN }}
tag: '${{ env.VERSION_NAME }}_(${{ github.event.inputs.number }})'
tag: '${{ env.VERSION_NAME }}_(${{ env.VERSION_NUMBER }})'
name: v${{ env.VERSION_NAME }}
draft: true
prerelease: true
@ -97,7 +102,7 @@ jobs:
runs-on: ubuntu-latest
needs: [build-android]
env:
VERSION_NAME: ${{ github.event.inputs.version }}-beta.${{ github.event.inputs.beta-number }}
VERSION_NAME: ${{ needs.build-android.outputs.version_name }}
steps:
- uses: actions/checkout@v3
with:

135
.github/workflows/release-stable.yaml vendored
View file

@ -2,15 +2,8 @@ name: Compile and release production build
on:
workflow_dispatch:
inputs:
version:
description: "Version"
required: true
default: "1.0.0"
number:
description: "Build number"
required: true
default: "1"
branches:
- master
jobs:
build-android:
name: Build Android .apk and .aab
@ -26,8 +19,23 @@ jobs:
run: echo "${{ secrets.KEY_PROPERTIES }}" | base64 --decode > android/key.properties
- name: Decode .env
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
- name: Update version in YAML
run: sed -i 's/99.99.99+99/${{ github.event.inputs.version }}+${{ github.event.inputs.number }}/g' pubspec.yaml
- name: Read pubspec.yaml
uses: jbutcher5/read-yaml@1.6
id: read_pubspec
with:
file: './pubspec.yaml'
key-path: '["version"]'
- name: Split version string
uses: winterjung/split@v2
id: splitted_version
with:
msg: "${{ steps.read_pubspec.outputs.data }}"
separator: "+"
- name: Save version on env variable
run: |
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
- name: Update KeyStore password in gradle properties
run: sed -i 's/#{KEYSTORE_PASS}#/${{ secrets.KEYSTORE_PASS }}/g' android/key.properties
- name: Update KeyStore key password in gradle properties
@ -44,20 +52,20 @@ jobs:
- run: flutter build apk --release
- run: flutter build appbundle --release
- name: Rename apk
run: mv $ANDROID_APK_RELEASE_PATH/app-release.apk $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk
run: mv $ANDROID_APK_RELEASE_PATH/app-release.apk $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk
- name: Rename aab
run: mv $ANDROID_AAB_RELEASE_PATH/app-release.aab $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
run: mv $ANDROID_AAB_RELEASE_PATH/app-release.aab $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
- name: Copy apk to project root
run: cp $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk
run: cp $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk
- name: Copy aab to project root
run: cp $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
run: cp $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: android
path: |
AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk
AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk
build-macos:
name: Build macOS .dmg
runs-on: macos-latest
@ -67,8 +75,23 @@ jobs:
- uses: actions/checkout@v3
- name: Decode .env
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
- name: Update version in YAML
run: sed -i '' 's/99.99.99+99/${{ github.event.inputs.version }}+${{ github.event.inputs.number }}/g' pubspec.yaml
- name: Read pubspec.yaml
uses: jbutcher5/read-yaml@1.6
id: read_pubspec
with:
file: './pubspec.yaml'
key-path: '["version"]'
- name: Split version string
uses: winterjung/split@v2
id: splitted_version
with:
msg: "${{ steps.read_pubspec.outputs.data }}"
separator: "+"
- name: Save version on env variable
run: |
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
- uses: subosito/flutter-action@v2
with:
channel: "stable"
@ -96,14 +119,14 @@ jobs:
- name: Generate symbolic link to Applications dir
run: ln -s /Applications $MACOS_APP_RELEASE_PATH/AdGuard\ Home\ Manager
- name: Generate dmg
run: hdiutil create -srcfolder $MACOS_APP_RELEASE_PATH/AdGuard\ Home\ Manager $MACOS_APP_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_macOS_Universal.dmg
run: hdiutil create -srcfolder $MACOS_APP_RELEASE_PATH/AdGuard\ Home\ Manager $MACOS_APP_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_macOS_Universal.dmg
- name: Copy dmg to project root
run: cp $MACOS_APP_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_macOS_Universal.dmg AdGuardHomeManager_${{ github.event.inputs.version }}_macOS_Universal.dmg
run: cp $MACOS_APP_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_macOS_Universal.dmg AdGuardHomeManager_${{ env.VERSION_NAME }}_macOS_Universal.dmg
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: macos
path: AdGuardHomeManager_${{ github.event.inputs.version }}_macOS_Universal.dmg
path: AdGuardHomeManager_${{ env.VERSION_NAME }}_macOS_Universal.dmg
build-linux:
name: Build Linux .tar.gz and .deb
runs-on: ubuntu-latest
@ -111,10 +134,25 @@ jobs:
- uses: actions/checkout@v3
- name: Decode .env
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
- name: Update version in pubspec.yaml
run: sed -i 's/99.99.99+99/${{ github.event.inputs.version }}+${{ github.event.inputs.number }}/g' pubspec.yaml
- name: Read pubspec.yaml
uses: jbutcher5/read-yaml@1.6
id: read_pubspec
with:
file: './pubspec.yaml'
key-path: '["version"]'
- name: Split version string
uses: winterjung/split@v2
id: splitted_version
with:
msg: "${{ steps.read_pubspec.outputs.data }}"
separator: "+"
- name: Save version on env variable
run: |
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
- name: Update version in debian.yaml
run: sed -i 's/<REPLACE_VERSION_NUMBER_ACTIONS>/${{ github.event.inputs.version }}/g' debian/debian.yaml
run: sed -i 's/<REPLACE_VERSION_NUMBER_ACTIONS>/${{ env.VERSION_NAME }}/g' debian/debian.yaml
- name: Update dependencies list
run: sudo apt-get update
- name: Install dependencies
@ -130,7 +168,7 @@ jobs:
- name: Generate .deb package
run: flutter_to_debian
- name: Move .deb package to project root
run: mv debian/packages/AdGuardHomeManager_${{ github.event.inputs.version }}_amd64.deb AdGuardHomeManager_${{ github.event.inputs.version }}_Linux_amd64.deb
run: mv debian/packages/AdGuardHomeManager_${{ env.VERSION_NAME }}_amd64.deb AdGuardHomeManager_${{ env.VERSION_NAME }}_Linux_amd64.deb
- name: Generate .tar.gz package
uses: a7ul/tar-action@v1.1.3
id: compress
@ -141,14 +179,14 @@ jobs:
./data
./lib
./AdGuardHomeManager
outPath: AdGuardHomeManager_${{ github.event.inputs.version }}_Linux.tar.gz
outPath: AdGuardHomeManager_${{ env.VERSION_NAME }}_Linux.tar.gz
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: linux
path: |
AdGuardHomeManager_${{ github.event.inputs.version }}_Linux_amd64.deb
AdGuardHomeManager_${{ github.event.inputs.version }}_Linux.tar.gz
AdGuardHomeManager_${{ env.VERSION_NAME }}_Linux_amd64.deb
AdGuardHomeManager_${{ env.VERSION_NAME }}_Linux.tar.gz
build-windows:
name: Build Windows installer
runs-on: windows-latest
@ -158,13 +196,27 @@ jobs:
shell: pwsh
run: |
[IO.File]::WriteAllBytes('.env', [Convert]::FromBase64String('${{ secrets.ENV }}'))
- name: Update version in pubspec.yaml
shell: bash
run: sed -i 's/99.99.99+99/${{ github.event.inputs.version }}+${{ github.event.inputs.number }}/g' pubspec.yaml
- name: Read pubspec.yaml
uses: jbutcher5/read-yaml@1.6
id: read_pubspec
with:
file: './pubspec.yaml'
key-path: '["version"]'
- name: Split version string
uses: winterjung/split@v2
id: splitted_version
with:
msg: "${{ steps.read_pubspec.outputs.data }}"
separator: "+"
- name: Save version on env variable
run: |
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
- name: Update version in innosetup config file
shell: pwsh
run: |
(Get-Content windows/innosetup_installer_builder.iss) -replace '<REPLACE_VERSION_ACTIONS>', '${{ github.event.inputs.version }}' | Out-File -encoding ASCII windows/innosetup_installer_builder.iss
(Get-Content windows/innosetup_installer_builder.iss) -replace '<REPLACE_VERSION_ACTIONS>', '${{ env.VERSION_NAME }}' | Out-File -encoding ASCII windows/innosetup_installer_builder.iss
- uses: subosito/flutter-action@v2
with:
channel: "stable"
@ -174,16 +226,19 @@ jobs:
- name: Build installer witn innosetup
run: iscc /Q windows/innosetup_installer_builder.iss
- name: Move installer file to root directory
run: move build/windows/aghm_installer.exe AdGuardHomeManager_${{ github.event.inputs.version }}_Windows_x64.exe
run: move build/windows/aghm_installer.exe AdGuardHomeManager_${{ env.VERSION_NAME }}_Windows_x64.exe
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: windows
path: AdGuardHomeManager_${{ github.event.inputs.version }}_Windows_x64.exe
path: AdGuardHomeManager_${{ env.VERSION_NAME }}_Windows_x64.exe
release-builds-github:
name: Release builds to GitHub
runs-on: ubuntu-latest
needs: [build-android, build-macos, build-linux, build-windows]
env:
VERSION_NAME: ${{ needs.build-android.outputs.version_name }}
VERSION_NUMBER: ${{ needs.build-android.outputs.version_number }}
steps:
- uses: actions/checkout@v3
- name: Create builds directory
@ -213,8 +268,8 @@ jobs:
with:
artifacts: "releases/*"
token: ${{ secrets.GH_TOKEN }}
tag: '${{ github.event.inputs.version }}_(${{ github.event.inputs.number }})'
name: v${{ github.event.inputs.version }}
tag: '${{ env.VERSION_NAME }}_(${{ env.VERSION_NUMBER }})'
name: v${{ env.VERSION_NAME }}
draft: true
prerelease: false
commit: ${{ github.sha }}
@ -222,6 +277,8 @@ jobs:
name: Release Android build to the Google Play Store
runs-on: ubuntu-latest
needs: [build-android, build-macos, build-linux, build-windows]
env:
VERSION_NAME: ${{ needs.build-android.outputs.version_name }}
steps:
- uses: actions/checkout@v3
- name: Download Android artifacts
@ -233,7 +290,7 @@ jobs:
with:
serviceAccountJsonPlainText: ${{ secrets.PLAYSTORE_ACCOUNT_KEY }}
packageName: com.jgeek00.adguard_home_manager
releaseFiles: AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
releaseFiles: AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
track: production
status: draft
releaseName: ${{ github.event.inputs.version }}
releaseName: ${{ env.VERSION_NAME }}

4
lib/functions/check_app_updates.dart
View file

@ -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);

7
lib/providers/servers_provider.dart
View file

@ -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;
}

47
lib/screens/clients/client/logs_list_client.dart
View file

@ -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) {
setState(() => isLoadingMore = false);
}
if (loadingMore != null && loadingMore == true && mounted) {
setState(() => isLoadingMore = false);
}
if (mounted) {
if (result['result'] == 'success') {
setState(() => 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];
setState(() => logsData = newLogsData);
}
else {
LogsData newLogsData = result['data'];
setState(() => logsData = newLogsData);
}
setState(() => loadStatus = 1);
}
else {
setState(() => loadStatus = 2);
widget.appConfigProvider.addLog(result['log']);
}
if (result.successful == true) {
setState(() => offset = inOffset != null ? inOffset+logsQuantity : offset+logsQuantity);
if (loadingMore != null && loadingMore == true && logsData != null) {
LogsData newLogsData = result.content;
newLogsData.data = [...logsData!.data, ...result.content.data];
setState(() => logsData = newLogsData);
}
else {
LogsData newLogsData = result.content;
setState(() => logsData = newLogsData);
}
setState(() => loadStatus = 1);
}
else {
setState(() => loadStatus = 2);
}
}

13
lib/services/api_client.dart
View file

@ -689,10 +689,15 @@ class ApiClientV2 {
server: server,
body: data,
);
return ApiResponse(
successful: result.successful,
content: result.body != null ? jsonDecode(result.body!) : null
);
try {
return ApiResponse(
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({

62
lib/services/external_requests.dart
View file

@ -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();
HttpClientRequest request = await httpClient.getUrl(Uri.parse(Urls.getReleasesGitHub));
HttpClientResponse response = await request.close();
String reply = await response.transform(utf8.decoder).join();
httpClient.close();
final response = await http.get(Uri.parse(Urls.getReleasesGitHub));
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) {
Sentry.captureException(e, stackTrace: stackTrace);
} catch (e) {
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();
HttpClientRequest request = await httpClient.getUrl(Uri.parse(Urls.getLatestReleaseGitHub));
HttpClientResponse response = await request.close();
String reply = await response.transform(utf8.decoder).join();
httpClient.close();
final response = await http.get(
Uri.parse(
releaseTag != null
? "${Urls.adGuardHomeReleasesTags}/$releaseTag"
: 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) {
Sentry.captureException(e, stackTrace: stackTrace);
} catch (e) {
return const ApiResponse(successful: false);
}
}

2
lib/widgets/layout.dart
View file

@ -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,

2
pubspec.lock
View file

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

3
pubspec.yaml
View file

@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 99.99.99+99
version: 2.11.1+106
environment:
sdk: '>=2.18.1 <3.0.0'
@ -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: