diff --git a/README.md b/README.md index d46c921..843bff8 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,6 @@ If you like the project and you want to contribute with the development, you can - [flutter custom tabs](https://pub.dev/packages/flutter_custom_tabs) - [shared preferences](https://pub.dev/packages/shared_preferences) - [window manager](https://pub.dev/packages/window_manager) -- [install referrer](https://pub.dev/packages/install_referrer)
diff --git a/android/app/build.gradle b/android/app/build.gradle index 29785d0..ab6291c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -29,8 +29,9 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 34 - ndkVersion flutter.ndkVersion + namespace "com.jgeek00.adguard_home_manager" + compileSdkVersion 35 + ndkVersion "26.1.10909125" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -46,12 +47,9 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.jgeek00.adguard_home_manager" - // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. minSdkVersion 26 - targetSdkVersion 34 + targetSdkVersion 35 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c472b9..19cfad9 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index b14b9f7..e8481f5 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '7.4.2' apply false + id "com.android.application" version '8.6.0' apply false id "org.jetbrains.kotlin.android" version "1.8.20" apply false } diff --git a/lib/functions/check_app_updates.dart b/lib/functions/check_app_updates.dart deleted file mode 100644 index 504ba2c..0000000 --- a/lib/functions/check_app_updates.dart +++ /dev/null @@ -1,57 +0,0 @@ -// import 'dart:io'; - -// import 'package:install_referrer/install_referrer.dart'; - -// import 'package:adguard_home_manager/functions/compare_versions.dart'; -// import 'package:adguard_home_manager/services/external_requests.dart'; -// import 'package:adguard_home_manager/models/github_release.dart'; - -// Future checkAppUpdates({ -// required String currentBuildNumber, -// required void Function(GitHubRelease?) setUpdateAvailable, -// required InstallationAppReferrer? installationSource, -// required bool isBeta -// }) async { -// var result = isBeta -// ? await ExternalRequests.getReleasesGitHub() -// : await ExternalRequests.getReleaseData(); - -// if (result.successful == true) { -// late GitHubRelease gitHubRelease; -// if (isBeta) { -// gitHubRelease = (result.content as List).firstWhere((r) => r.prerelease == true); -// } -// else { -// gitHubRelease = result.content as GitHubRelease; -// } - -// final update = gitHubUpdateExists( -// currentBuildNumber: currentBuildNumber, -// gitHubRelease: gitHubRelease, -// isBeta: isBeta -// ); - -// if (update == true) { -// setUpdateAvailable(gitHubRelease); - -// if (Platform.isAndroid) { -// if (installationSource == InstallationAppReferrer.androidManually) { -// return gitHubRelease; -// } -// else { -// return null; -// } -// } -// else if (Platform.isIOS) { -// return null; -// } -// else { -// return gitHubRelease; -// } -// } -// else { -// setUpdateAvailable(null); -// } -// } -// return null; -// } \ No newline at end of file diff --git a/lib/providers/app_config_provider.dart b/lib/providers/app_config_provider.dart index 3b843b9..bb6887c 100644 --- a/lib/providers/app_config_provider.dart +++ b/lib/providers/app_config_provider.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/scheduler.dart'; -import 'package:install_referrer/install_referrer.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:package_info_plus/package_info_plus.dart'; @@ -58,8 +57,6 @@ class AppConfigProvider with ChangeNotifier { GitHubRelease? _appUpdatesAvailable; - InstallationAppReferrer? _installationSource; - PackageInfo? get getAppInfo { return _appInfo; } @@ -162,10 +159,6 @@ class AppConfigProvider with ChangeNotifier { return _appUpdatesAvailable; } - InstallationAppReferrer? get installationSource { - return _installationSource; - } - List get homeTopItemsOrder { return _homeTopItemsOrder; } @@ -227,11 +220,6 @@ class AppConfigProvider with ChangeNotifier { notifyListeners(); } - void setInstallationSource(InstallationAppReferrer value) { - _installationSource = value; - notifyListeners(); - } - Future setOverrideSslCheck(bool status) async { try { sharedPreferencesInstance.setBool('overrideSslCheck', status); diff --git a/lib/widgets/add_server/add_server_modal.dart b/lib/widgets/add_server/add_server_modal.dart index ec00ff6..7164ba0 100644 --- a/lib/widgets/add_server/add_server_modal.dart +++ b/lib/widgets/add_server/add_server_modal.dart @@ -142,6 +142,7 @@ class _AddServerModalState extends State { port: portController.text != '' ? int.parse(portController.text) : null, user: userController.text != "" ? userController.text : null, password: passwordController.text != "" ? passwordController.text : null, + path: pathController.text != "" ? pathController.text : null, defaultServer: defaultServer, authToken: homeAssistant == true ? encodeBase64UserPass(userController.text, passwordController.text) diff --git a/pubspec.lock b/pubspec.lock index e7c67eb..0b93bac 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -282,18 +282,18 @@ packages: dependency: "direct dev" description: name: flutter_launcher_icons - sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77" url: "https://pub.dev" source: hosted - version: "0.13.1" + version: "0.14.1" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -303,10 +303,10 @@ packages: dependency: "direct main" description: name: flutter_markdown - sha256: a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7 + sha256: e17575ca576a34b46c58c91f9948891117a1bd97815d2e661813c7f90c647a78 url: "https://pub.dev" source: hosted - version: "0.7.3+1" + version: "0.7.3+2" flutter_native_splash: dependency: "direct dev" description: @@ -373,14 +373,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.2.0" - install_referrer: - dependency: "direct main" - description: - name: install_referrer - sha256: "901c56d24ee3c3010dfd0bbebf305ed6b4b0f3fe969192081c167590a64cd78b" - url: "https://pub.dev" - source: hosted - version: "1.2.1" intl: dependency: "direct main" description: @@ -425,10 +417,10 @@ packages: dependency: transitive description: name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" list_counter: dependency: transitive description: @@ -601,18 +593,18 @@ packages: dependency: transitive description: name: sentry - sha256: "1af8308298977259430d118ab25be8e1dda626cdefa1e6ce869073d530d39271" + sha256: "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd" url: "https://pub.dev" source: hosted - version: "8.8.0" + version: "8.9.0" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: "18fe4d125c2d529bd6127200f0d2895768266a8c60b4fb50b2086fd97e1a4ab2" + sha256: "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a" url: "https://pub.dev" source: hosted - version: "8.8.0" + version: "8.9.0" shared_preferences: dependency: "direct main" description: @@ -694,26 +686,26 @@ packages: dependency: "direct main" description: name: sqflite - sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d + sha256: ff5a2436ef8ebdfda748fbfe957f9981524cb5ff11e7bafa8c42771840e8a788 url: "https://pub.dev" source: hosted - version: "2.3.3+1" + version: "2.3.3+2" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e" + sha256: "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4" url: "https://pub.dev" source: hosted - version: "2.5.4+2" + version: "2.5.4+4" sqflite_common_ffi: dependency: "direct main" description: name: sqflite_common_ffi - sha256: "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5" + sha256: a6057d4c87e9260ba1ec436ebac24760a110589b9c0a859e128842eb69a7ef04 url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.3.3+1" sqlite3: dependency: transitive description: @@ -758,10 +750,10 @@ packages: dependency: transitive description: name: synchronized - sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255 + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.3.0+3" term_glyph: dependency: transitive description: @@ -838,10 +830,10 @@ packages: dependency: transitive description: name: url_launcher_macos - sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_platform_interface: dependency: transitive description: @@ -870,10 +862,10 @@ packages: dependency: "direct main" description: name: uuid - sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.5.1" vector_graphics: dependency: transitive description: @@ -918,10 +910,10 @@ packages: dependency: transitive description: name: web - sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" win32: dependency: transitive description: @@ -934,10 +926,10 @@ packages: dependency: transitive description: name: win32_registry - sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6" + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.1.5" window_manager: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 2fd5ee4..e1bb529 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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: 2.19.1+144 +version: 2.19.2+145 environment: sdk: '>=2.18.1 <3.0.0' @@ -70,7 +70,6 @@ dependencies: url_launcher: ^6.2.4 shared_preferences: ^2.2.2 window_manager: ^0.4.2 - install_referrer: ^1.2.1 dev_dependencies: flutter_test: @@ -81,8 +80,8 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^4.0.0 - flutter_launcher_icons: ^0.13.1 + flutter_lints: ^5.0.0 + flutter_launcher_icons: ^0.14.1 flutter_native_splash: ^2.3.8 # For information on the generic Dart part of this file, see the diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 683e616..e79e36b 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -18,8 +17,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("DynamicColorPluginCApi")); ScreenRetrieverPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("ScreenRetrieverPlugin")); - SentryFlutterPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("SentryFlutterPlugin")); Sqlite3FlutterLibsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index b2ba396..38558c8 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -5,13 +5,13 @@ list(APPEND FLUTTER_PLUGIN_LIST dynamic_color screen_retriever - sentry_flutter sqlite3_flutter_libs url_launcher_windows window_manager ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + sentry_flutter ) set(PLUGIN_BUNDLED_LIBRARIES)