vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of https://github.com/hiddify/hiddify-next

Browse Source
This commit is contained in:
hiddify
2023-12-25 20:08:54 +03:30
parent 160e717fba 175e2a8f30
commit 1f1bee1300
11 changed files with 109 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/bootstrap.dart
View File

@@ -65,7 +65,8 @@ Future<void> lazyBootstrap(
() => container.read(sharedPreferencesProvider.future),
);
final enableAnalytics = container.read(analyticsControllerProvider);
final enableAnalytics =
await container.read(analyticsControllerProvider.future);
if (enableAnalytics) {
await _init(
"analytics",

72
lib/core/analytics/analytics_controller.dart
View File

@@ -19,7 +19,7 @@ bool _testCrashReport = false;
@Riverpod(keepAlive: true)
class AnalyticsController extends _$AnalyticsController with AppLogger {
@override
bool build() {
Future<bool> build() async {
return _preferences.getBool(enableAnalyticsPrefKey) ?? true;
}
@@ -27,41 +27,47 @@ class AnalyticsController extends _$AnalyticsController with AppLogger {
ref.read(sharedPreferencesProvider).requireValue;
Future<void> enableAnalytics() async {
loggy.debug("enabling analytics");
if (!state) {
await _preferences.setBool(enableAnalyticsPrefKey, true);
if (state case AsyncData(value: final enabled)) {
loggy.debug("enabling analytics");
state = const AsyncLoading();
if (!enabled) {
await _preferences.setBool(enableAnalyticsPrefKey, true);
}
final env = ref.read(environmentProvider);
final appInfo = await ref.read(appInfoProvider.future);
final dsn = !kDebugMode || _testCrashReport ? Environment.sentryDSN : "";
final sentryLogger = SentryLoggyIntegration();
LoggerController.instance.addPrinter("analytics", sentryLogger);
await SentryFlutter.init(
(options) {
options.dsn = dsn;
options.environment = env.name;
options.dist = appInfo.release.name;
options.debug = kDebugMode;
options.enableNativeCrashHandling = true;
options.enableNdkScopeSync = true;
options.attachThreads = true;
options.tracesSampleRate = 0.20;
options.enableUserInteractionTracing = true;
options.addIntegration(sentryLogger);
options.beforeSend = sentryBeforeSend;
},
);
state = const AsyncData(true);
}
final env = ref.read(environmentProvider);
final appInfo = await ref.read(appInfoProvider.future);
final dsn = !kDebugMode || _testCrashReport ? Environment.sentryDSN : "";
final sentryLogger = SentryLoggyIntegration();
LoggerController.instance.addPrinter("analytics", sentryLogger);
await SentryFlutter.init(
(options) {
options.dsn = dsn;
options.environment = env.name;
options.dist = appInfo.release.name;
options.debug = kDebugMode;
options.enableNativeCrashHandling = true;
options.enableNdkScopeSync = true;
options.attachThreads = true;
options.tracesSampleRate = 0.20;
options.enableUserInteractionTracing = true;
options.addIntegration(sentryLogger);
options.beforeSend = sentryBeforeSend;
},
);
state = true;
}
Future<void> disableAnalytics() async {
loggy.debug("disabling analytics");
await _preferences.setBool(enableAnalyticsPrefKey, false);
await Sentry.close();
LoggerController.instance.removePrinter("analytics");
state = false;
if (state case AsyncData()) {
loggy.debug("disabling analytics");
state = const AsyncLoading();
await _preferences.setBool(enableAnalyticsPrefKey, false);
await Sentry.close();
LoggerController.instance.removePrinter("analytics");
state = const AsyncData(false);
}
}
}

14
lib/core/http_client/http_client_provider.dart
View File

@@ -1,9 +1,5 @@
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:hiddify/core/app_info/app_info_provider.dart';
import 'package:hiddify/core/preferences/general_preferences.dart';
import 'package:native_dio_adapter/native_dio_adapter.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'http_client_provider.g.dart';
@@ -20,9 +16,11 @@ Dio httpClient(HttpClientRef ref) {
},
),
);
final debug = ref.read(debugModeNotifierProvider);
if (debug && (Platform.isAndroid || Platform.isIOS || Platform.isMacOS)) {
dio.httpClientAdapter = NativeAdapter();
}
// https://github.com/dart-lang/http/issues/1047
// https://github.com/cfug/dio/issues/2042
// final debug = ref.read(debugModeNotifierProvider);
// if (debug && (Platform.isAndroid || Platform.isIOS || Platform.isMacOS)) {
// dio.httpClientAdapter = NativeAdapter();
// }
return dio;
}

6
lib/features/common/general_pref_tiles.dart
View File

@@ -104,7 +104,7 @@ class EnableAnalyticsPrefTile extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final t = ref.watch(translationsProvider);
final autoReport = ref.watch(analyticsControllerProvider);
final enabled = ref.watch(analyticsControllerProvider).requireValue;
return SwitchListTile(
title: Text(t.settings.general.enableAnalytics),
@@ -113,12 +113,12 @@ class EnableAnalyticsPrefTile extends HookConsumerWidget {
style: Theme.of(context).textTheme.bodySmall,
),
secondary: const Icon(Icons.bug_report),
value: autoReport,
value: enabled,
onChanged: (value) async {
if (onChanged != null) {
return onChanged!(value);
}
if (autoReport) {
if (enabled) {
await ref
.read(analyticsControllerProvider.notifier)
.disableAnalytics();

4
lib/features/intro/widget/intro_page.dart
View File

@@ -73,7 +73,9 @@ class IntroPage extends HookConsumerWidget with PresLogger {
onPressed: () async {
if (isStarting.value) return;
isStarting.value = true;
if (!ref.read(analyticsControllerProvider)) {
if (!ref
.read(analyticsControllerProvider)
.requireValue) {
loggy.info("disabling analytics per user request");
try {
await ref