TF-1361 Fix open notification while no network connection
This commit is contained in:
@@ -72,6 +72,11 @@ abstract class BaseController extends GetxController
|
|||||||
}
|
}
|
||||||
|
|
||||||
void onError(dynamic error) {
|
void onError(dynamic error) {
|
||||||
|
if (error is NoNetworkError) {
|
||||||
|
logError('BaseController::onError(): $error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final _appToast = Get.find<AppToast>();
|
final _appToast = Get.find<AppToast>();
|
||||||
final _imagePaths = Get.find<ImagePaths>();
|
final _imagePaths = Get.find<ImagePaths>();
|
||||||
final _responsiveUtils = Get.find<ResponsiveUtils>();
|
final _responsiveUtils = Get.find<ResponsiveUtils>();
|
||||||
|
|||||||
+40
-10
@@ -22,17 +22,18 @@ class NetworkConnectionController extends BaseController {
|
|||||||
|
|
||||||
NetworkConnectionController(this._connectivity);
|
NetworkConnectionController(this._connectivity);
|
||||||
|
|
||||||
|
@override
|
||||||
|
void onInit() {
|
||||||
|
super.onInit();
|
||||||
|
log('NetworkConnectionController::onInit():');
|
||||||
|
_listenNetworkConnectionChanged();
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void onReady() {
|
void onReady() {
|
||||||
subscription = _connectivity.onConnectivityChanged.listen((ConnectivityResult result) {
|
super.onReady();
|
||||||
connectivityResult.value = result;
|
log('NetworkConnectionController::onReady():');
|
||||||
if (_isEnableShowToastDisconnection && result == ConnectivityResult.none) {
|
_getCurrentNetworkConnectionState();
|
||||||
_showToastLostConnection();
|
|
||||||
} else {
|
|
||||||
ToastView.dismiss();
|
|
||||||
}
|
|
||||||
}) ;
|
|
||||||
super.onReady();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -44,7 +45,36 @@ class NetworkConnectionController extends BaseController {
|
|||||||
@override
|
@override
|
||||||
void onDone() {}
|
void onDone() {}
|
||||||
|
|
||||||
void setNetworkConnectivityState(ConnectivityResult newConnectivityResult) {
|
void _getCurrentNetworkConnectionState() async {
|
||||||
|
final currentConnectionResult = await _connectivity.checkConnectivity();
|
||||||
|
log('NetworkConnectionController::onReady():_getCurrentNetworkConnectionState: $currentConnectionResult');
|
||||||
|
_setNetworkConnectivityState(currentConnectionResult);
|
||||||
|
if (_isEnableShowToastDisconnection && !isNetworkConnectionAvailable()) {
|
||||||
|
_showToastLostConnection();
|
||||||
|
} else {
|
||||||
|
ToastView.dismiss();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _listenNetworkConnectionChanged() {
|
||||||
|
subscription = _connectivity.onConnectivityChanged.listen(
|
||||||
|
(result) {
|
||||||
|
log('NetworkConnectionController::_listenNetworkConnectionChanged():onConnectivityChanged: $result');
|
||||||
|
_setNetworkConnectivityState(result);
|
||||||
|
if (_isEnableShowToastDisconnection && !isNetworkConnectionAvailable()) {
|
||||||
|
_showToastLostConnection();
|
||||||
|
} else {
|
||||||
|
ToastView.dismiss();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onError: (error, stackTrace) {
|
||||||
|
logError('NetworkConnectionController::_listenNetworkConnectionChanged():error: $error');
|
||||||
|
logError('NetworkConnectionController::_listenNetworkConnectionChanged():stackTrace: $stackTrace');
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _setNetworkConnectivityState(ConnectivityResult newConnectivityResult) {
|
||||||
connectivityResult.value = newConnectivityResult;
|
connectivityResult.value = newConnectivityResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import 'package:jmap_dart_client/jmap/core/error/method/error_method_response.da
|
|||||||
|
|
||||||
abstract class RemoteException with EquatableMixin implements Exception {
|
abstract class RemoteException with EquatableMixin implements Exception {
|
||||||
static const connectError = 'Connect error';
|
static const connectError = 'Connect error';
|
||||||
|
static const noNetworkError = 'No network error';
|
||||||
|
|
||||||
final String? message;
|
final String? message;
|
||||||
final int? code;
|
final int? code;
|
||||||
@@ -41,3 +42,10 @@ class MethodLevelErrors extends RemoteException {
|
|||||||
class CannotCalculateChangesMethodResponseException extends MethodLevelErrors {
|
class CannotCalculateChangesMethodResponseException extends MethodLevelErrors {
|
||||||
CannotCalculateChangesMethodResponseException({String? message}) : super(ErrorMethodResponse.cannotCalculateChanges, message: message);
|
CannotCalculateChangesMethodResponseException({String? message}) : super(ErrorMethodResponse.cannotCalculateChanges, message: message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class NoNetworkError extends RemoteException {
|
||||||
|
const NoNetworkError() : super(message: RemoteException.noNetworkError);
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [message];
|
||||||
|
}
|
||||||
@@ -1,14 +1,26 @@
|
|||||||
|
import 'package:core/utils/app_logger.dart';
|
||||||
import 'package:dio/dio.dart';
|
import 'package:dio/dio.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/error/method/error_method_response.dart';
|
import 'package:jmap_dart_client/jmap/core/error/method/error_method_response.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/error/method/exception/error_method_response_exception.dart';
|
import 'package:jmap_dart_client/jmap/core/error/method/exception/error_method_response_exception.dart';
|
||||||
import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart';
|
import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart';
|
||||||
|
import 'package:tmail_ui_user/features/network_status_handle/presentation/network_connnection_controller.dart';
|
||||||
import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart';
|
import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart';
|
||||||
import 'package:tmail_ui_user/main/exceptions/remote_exception.dart';
|
import 'package:tmail_ui_user/main/exceptions/remote_exception.dart';
|
||||||
|
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
||||||
|
|
||||||
class RemoteExceptionThrower extends ExceptionThrower {
|
class RemoteExceptionThrower extends ExceptionThrower {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void throwException(dynamic error) {
|
void throwException(dynamic error) {
|
||||||
|
logError('RemoteExceptionThrower::throwException():error: $error');
|
||||||
|
final networkConnectionController = getBinding<NetworkConnectionController>();
|
||||||
|
if (networkConnectionController != null) {
|
||||||
|
log('RemoteExceptionThrower::throwException(): CONNECTION: ${networkConnectionController.connectivityResult.value}');
|
||||||
|
if (!networkConnectionController.isNetworkConnectionAvailable()) {
|
||||||
|
throw const NoNetworkError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (error is DioError) {
|
if (error is DioError) {
|
||||||
switch (error.type) {
|
switch (error.type) {
|
||||||
case DioErrorType.connectTimeout:
|
case DioErrorType.connectTimeout:
|
||||||
|
|||||||
Reference in New Issue
Block a user