Skip to content

Always listen for Network Connection for Offline Indictor #11672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neil-marcellini merged 8 commits into from
Oct 17, 2022
Merged

Always listen for Network Connection for Offline Indictor #11672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6d279a1
Add a network function to force offline mode
neil-marcellini Oct 10, 2022
7087df0
Add a force offline toggle in dev preferences
neil-marcellini Oct 10, 2022
b986bcc
Always listen for offline indicator
grgia Oct 7, 2022
3a085c3
Removed unused method stopListeningForReconnect()
grgia Oct 12, 2022
eab30a1
Merge branch 'main' into georgia-offline-bug
grgia Oct 12, 2022
39eb643
Remove Neil's commits
grgia Oct 12, 2022
3cc990a
Removed unused variables unsubscribeFromNetInfo and unsubscribeFromAp…
grgia Oct 13, 2022
b5d4794
Remove comment about deleted variables
grgia Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 2 additions & 22 deletions src/libs/NetworkConnection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ import * as NetworkActions from './actions/Network';
import CONFIG from '../CONFIG';
import CONST from '../CONST';

// NetInfo.addEventListener() returns a function used to unsubscribe the
// listener so we must create a reference to it and call it in stopListeningForReconnect()
let unsubscribeFromNetInfo;
let unsubscribeFromAppState;
let isOffline = false;
let hasPendingNetworkCheck = false;

Expand Down Expand Up @@ -67,7 +63,7 @@ function subscribeToNetInfo() {

// Subscribe to the state change event via NetInfo so we can update
// whether a user has internet connectivity or not.
unsubscribeFromNetInfo = NetInfo.addEventListener((state) => {
NetInfo.addEventListener((state) => {
Log.info('[NetworkConnection] NetInfo state change', false, state);
setOfflineStatus(state.isInternetReachable === false);
});
Expand All @@ -76,26 +72,11 @@ function subscribeToNetInfo() {
function listenForReconnect() {
Log.info('[NetworkConnection] listenForReconnect called');

unsubscribeFromAppState = AppStateMonitor.addBecameActiveListener(() => {
AppStateMonitor.addBecameActiveListener(() => {
triggerReconnectionCallbacks('app became active');
});
}

/**
* Tear down the event listeners when we are finished with them.
*/
function stopListeningForReconnect() {
Log.info('[NetworkConnection] stopListeningForReconnect called');
if (unsubscribeFromNetInfo) {
unsubscribeFromNetInfo();
unsubscribeFromNetInfo = undefined;
}
if (unsubscribeFromAppState) {
unsubscribeFromAppState();
unsubscribeFromAppState = undefined;
}
}

/**
* Register callback to fire when we reconnect
*
Expand Down Expand Up @@ -126,7 +107,6 @@ function recheckNetworkConnection() {
export default {
setOfflineStatus,
listenForReconnect,
stopListeningForReconnect,
onReconnect,
triggerReconnectionCallbacks,
recheckNetworkConnection,
Expand Down
2 changes: 0 additions & 2 deletions src/libs/actions/Session/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import * as Localize from '../../Localize';
import UnreadIndicatorUpdater from '../../UnreadIndicatorUpdater';
import Timers from '../../Timers';
import * as Pusher from '../../Pusher/pusher';
import NetworkConnection from '../../NetworkConnection';
import * as User from '../User';
import * as Authentication from '../../Authentication';
import * as Welcome from '../Welcome';
Expand Down Expand Up @@ -373,7 +372,6 @@ function clearSignInData() {
*/
function cleanupSession() {
// We got signed out in this tab or another so clean up any subscriptions and timers
NetworkConnection.stopListeningForReconnect();
UnreadIndicatorUpdater.stopListeningForReportChanges();
PushNotification.deregister();
PushNotification.clearNotifications();
Expand Down