[Android][Disable work manager] Change the logic of network status base on internet connection

(update every 5 secs)

(cherry picked from commit d665abc45d752165e3c13ef29619fd28b30d8eeb)
This commit is contained in:
Dat PHAM HOANG
2024-01-11 11:21:23 +07:00
committed by Dat H. Pham
parent b358188362
commit 46d29f21b9
5 changed files with 7 additions and 15 deletions
@@ -93,8 +93,7 @@ class NetworkConnectionController extends GetxController {
}
bool isNetworkConnectionAvailable() {
return _connectivityResult.value != ConnectivityResult.none &&
_internetConnectionStatus.value == InternetConnectionStatus.connected;
return _internetConnectionStatus.value == InternetConnectionStatus.connected;
}
Future<bool> hasInternetConnection() {
@@ -17,8 +17,6 @@ import 'package:tmail_ui_user/features/email/domain/state/delete_sending_email_s
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
import 'package:tmail_ui_user/features/network_connection/presentation/network_connection_controller.dart'
if (dart.library.html) 'package:tmail_ui_user/features/network_connection/presentation/web_network_connection_controller.dart';
import 'package:tmail_ui_user/features/offline_mode/model/sending_state.dart';
import 'package:tmail_ui_user/features/sending_queue/domain/extensions/list_sending_email_extension.dart';
import 'package:tmail_ui_user/features/sending_queue/domain/extensions/sending_email_extension.dart';
@@ -46,7 +44,6 @@ class SendingQueueController extends BaseController with MessageDialogActionMixi
final GetStoredSendingEmailInteractor _getStoredSendingEmailInteractor;
final dashboardController = Get.find<MailboxDashBoardController>();
final _networkConnectionController = Get.find<NetworkConnectionController>();
final _sendingQueueIsolateManager = getBinding<SendingQueueIsolateManager>();
final listSendingEmailController = ScrollController();
@@ -160,8 +157,6 @@ class SendingQueueController extends BaseController with MessageDialogActionMixi
bool get isAllUnSelected => dashboardController.listSendingEmails.isAllUnSelected();
bool get isConnectedNetwork => _networkConnectionController.isNetworkConnectionAvailable() == true;
void refreshSendingQueue() {
dashboardController.getAllSendingEmails();
}
@@ -42,7 +42,6 @@ class SendingQueueView extends GetWidget<SendingQueueController> with AppLoaderM
} else {
return BottomBarSendingQueueWidget(
listSendingEmailSelected: controller.dashboardController.listSendingEmails.listSelected(),
isConnectedNetwork: controller.isConnectedNetwork,
onHandleSendingEmailActionType: (actionType, listSendingEmails) => controller.handleSendingEmailActionType(context, actionType, listSendingEmails),
);
}
@@ -16,7 +16,6 @@ class BottomBarSendingQueueWidget extends StatelessWidget {
final List<SendingEmail> listSendingEmailSelected;
final OnHandleSendingEmailActionType? onHandleSendingEmailActionType;
final bool isConnectedNetwork;
final _imagePaths = Get.find<ImagePaths>();
final _responsiveUtils = Get.find<ResponsiveUtils>();
@@ -24,8 +23,7 @@ class BottomBarSendingQueueWidget extends StatelessWidget {
BottomBarSendingQueueWidget({
super.key,
required this.listSendingEmailSelected,
this.onHandleSendingEmailActionType,
this.isConnectedNetwork = true
this.onHandleSendingEmailActionType
});
@override
@@ -116,9 +114,10 @@ class BottomBarSendingQueueWidget extends StatelessWidget {
bool get _canResend {
if (PlatformInfo.isMobile) {
return isConnectedNetwork &&
listSendingEmailSelected.length == 1 &&
(listSendingEmailSelected.first.isWaiting || listSendingEmailSelected.first.isError);
return listSendingEmailSelected.length == 1 &&
(listSendingEmailSelected.first.isWaiting ||
listSendingEmailSelected.first.isError ||
listSendingEmailSelected.first.isCanceled);
} else {
return false;
}
+1 -1
View File
@@ -2735,7 +2735,7 @@
"placeholders_order": [],
"placeholders": {}
},
"messageHasBeenSavedToTheSendingQueue": "Message has been saved to the sending queue.",
"messageHasBeenSavedToTheSendingQueue": "Temporary network issue. Messages queued for retry when connected.",
"@messageHasBeenSavedToTheSendingQueue": {
"type": "text",
"placeholders_order": [],