fix
This commit is contained in:
parent
f59293da80
commit
f4e8f9a806
|
@ -10,7 +10,6 @@
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="com.google.firebase.messaging.default_notification_channel_id"
|
android:name="com.google.firebase.messaging.default_notification_channel_id"
|
||||||
android:value="@string/default_notification_channel_id" />
|
android:value="@string/default_notification_channel_id" />
|
||||||
<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
|
|
||||||
<application
|
<application
|
||||||
android:networkSecurityConfig="@xml/network_security_config"
|
android:networkSecurityConfig="@xml/network_security_config"
|
||||||
android:label="FRE ACCESS HUB"
|
android:label="FRE ACCESS HUB"
|
||||||
|
|
|
@ -21,9 +21,7 @@ import 'package:hub/pages/forgot_password_page/forgot_password_screen.dart';
|
||||||
import 'package:hub/shared/helpers/base_storage.dart';
|
import 'package:hub/shared/helpers/base_storage.dart';
|
||||||
import 'package:hub/shared/helpers/storage_helper.dart';
|
import 'package:hub/shared/helpers/storage_helper.dart';
|
||||||
import 'package:hub/shared/services/localization/localization_service.dart';
|
import 'package:hub/shared/services/localization/localization_service.dart';
|
||||||
import 'package:hub/shared/utils/device_util.dart';
|
|
||||||
import 'package:hub/shared/utils/dialog_util.dart';
|
|
||||||
import 'package:hub/shared/utils/log_util.dart';
|
|
||||||
import 'package:logging/logging.dart';
|
import 'package:logging/logging.dart';
|
||||||
import 'package:responsive_framework/responsive_framework.dart';
|
import 'package:responsive_framework/responsive_framework.dart';
|
||||||
|
|
||||||
|
@ -39,7 +37,6 @@ void main() async {
|
||||||
|
|
||||||
Future<void> initializeApp() async {
|
Future<void> initializeApp() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
LogUtil.setupLogging();
|
|
||||||
await _initializeTracking();
|
await _initializeTracking();
|
||||||
await StorageHelper().init();
|
await StorageHelper().init();
|
||||||
|
|
||||||
|
@ -185,37 +182,35 @@ class _AppState extends State<App> with WidgetsBindingObserver {
|
||||||
};
|
};
|
||||||
|
|
||||||
Future<void> initDeepLinks() async {
|
Future<void> initDeepLinks() async {
|
||||||
final Logger logger = Logger('initDeepLinks');
|
|
||||||
try {
|
try {
|
||||||
_appLinks = AppLinks();
|
_appLinks = AppLinks();
|
||||||
logger.severe('initDeepLinks');
|
print('initDeepLinks');
|
||||||
_linkSubscription = _appLinks.uriLinkStream.listen((uri) async {
|
_linkSubscription = _appLinks.uriLinkStream.listen((uri) async {
|
||||||
final bool isRecovered = StorageHelper().isRecovered;
|
final bool isRecovered = StorageHelper().isRecovered;
|
||||||
logger.severe('isRecovered: $isRecovered');
|
print('isRecovered: $isRecovered');
|
||||||
if (!isRecovered) await openAppLink(uri);
|
if (isRecovered == false) await openAppLink(uri);
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.severe('initDeepLinks error: $e');
|
print(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> openAppLink(Uri uri) async {
|
Future<void> openAppLink(Uri uri) async {
|
||||||
final Logger logger = Logger('openAppLink');
|
print('open app link: $uri');
|
||||||
logger.severe('open app link: $uri');
|
|
||||||
final bool isRecovered = StorageHelper().isRecovered;
|
final bool isRecovered = StorageHelper().isRecovered;
|
||||||
logger.severe('isRecovered: $isRecovered');
|
print('isRecovered: $isRecovered');
|
||||||
if (isRecovered) return;
|
if (isRecovered == true) return;
|
||||||
StorageHelper().isRecovered = true;
|
StorageHelper().isRecovered = true;
|
||||||
final String email = uri.queryParameters['email'] ?? '';
|
final String email = uri.queryParameters['email'] ?? '';
|
||||||
final String token = uri.queryParameters['token'] ?? '';
|
final String token = uri.queryParameters['token'] ?? '';
|
||||||
logger.severe('email: $email, token: $token');
|
print('email: $email, token: $token');
|
||||||
final bool isNotEmpty = email.isNotEmpty && token.isNotEmpty;
|
final bool isNotEmpty = email.isNotEmpty && token.isNotEmpty;
|
||||||
if (isNotEmpty) {
|
if (isNotEmpty) {
|
||||||
final BuildContext context = StorageHelper().context!;
|
final BuildContext context = StorageHelper().context!;
|
||||||
final FlutterFlowTheme theme = FlutterFlowTheme.of(context);
|
final FlutterFlowTheme theme = FlutterFlowTheme.of(context);
|
||||||
final Widget screen = ForgotPasswordScreen(email: email, token: token);
|
final Widget screen = ForgotPasswordScreen(email: email, token: token);
|
||||||
builder(context) => screen;
|
builder(context) => screen;
|
||||||
logger.severe('showModalBottomSheet');
|
print('showModalBottomSheet');
|
||||||
await showModalBottomSheet(
|
await showModalBottomSheet(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) => Padding(padding: MediaQuery.viewInsetsOf(context), child: builder(context)),
|
builder: (context) => Padding(padding: MediaQuery.viewInsetsOf(context), child: builder(context)),
|
||||||
|
@ -228,7 +223,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
|
||||||
// isDismissible: true,
|
// isDismissible: true,
|
||||||
).whenComplete(() {
|
).whenComplete(() {
|
||||||
StorageHelper().isRecovered = false;
|
StorageHelper().isRecovered = false;
|
||||||
logger.severe('showModalBottomSheet completed');
|
print('showModalBottomSheet completed');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -284,7 +279,6 @@ class _AppState extends State<App> with WidgetsBindingObserver {
|
||||||
const Duration(milliseconds: 1000), () => setState(() => _appStateNotifier.stopShowingSplashImage()));
|
const Duration(milliseconds: 1000), () => setState(() => _appStateNotifier.stopShowingSplashImage()));
|
||||||
|
|
||||||
_setupFirebaseMessaging();
|
_setupFirebaseMessaging();
|
||||||
// WidgetsBinding.instance.addPersistentFrameCallback((_) async => await initDeepLinks());
|
|
||||||
initDeepLinks();
|
initDeepLinks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
import 'dart:developer';
|
import 'dart:developer';
|
||||||
|
|
||||||
import 'package:firebase_crashlytics/firebase_crashlytics.dart';
|
import 'package:firebase_crashlytics/firebase_crashlytics.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
|
||||||
import 'package:hub/backend/api_requests/api_calls.dart';
|
import 'package:hub/backend/api_requests/api_calls.dart';
|
||||||
import 'package:logging/logging.dart';
|
|
||||||
|
|
||||||
class LogUtil {
|
class LogUtil {
|
||||||
static void requestAPIFailed(String url, String body, String reason, dynamic error, StackTrace stack) async {
|
static void requestAPIFailed(String url, String body, String reason, dynamic error, StackTrace stack) async {
|
||||||
|
@ -19,21 +17,4 @@ class LogUtil {
|
||||||
|
|
||||||
await FirebaseCrashlytics.instance.recordError(error, stack, reason: reason);
|
await FirebaseCrashlytics.instance.recordError(error, stack, reason: reason);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setupLogging() {
|
|
||||||
Logger.root.level = Level.ALL;
|
|
||||||
Logger.root.onRecord.listen((record) {
|
|
||||||
final logMessage = '${record.level.name}: ${record.time}: ${record.message}';
|
|
||||||
if (kReleaseMode) {
|
|
||||||
log(
|
|
||||||
logMessage,
|
|
||||||
name: record.loggerName,
|
|
||||||
error: record.error,
|
|
||||||
stackTrace: record.stackTrace,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
print(logMessage);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1008,10 +1008,10 @@ packages:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: logging
|
name: logging
|
||||||
sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
|
sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.2.0"
|
version: "1.3.0"
|
||||||
matcher:
|
matcher:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
@ -48,7 +48,6 @@ dependencies:
|
||||||
flutter_svg: 2.0.10+1
|
flutter_svg: 2.0.10+1
|
||||||
font_awesome_flutter: 10.7.0
|
font_awesome_flutter: 10.7.0
|
||||||
from_css_color: 2.0.0
|
from_css_color: 2.0.0
|
||||||
logging: ^1.3.0
|
|
||||||
go_router: ^14.3.0
|
go_router: ^14.3.0
|
||||||
google_fonts: 6.2.1
|
google_fonts: 6.2.1
|
||||||
http: 1.2.1
|
http: 1.2.1
|
||||||
|
|
Loading…
Reference in New Issue