Skip to content

Commit

Permalink
Merge pull request #18948 from Expensify/revert-18460-Rory-PingAuth
Browse files Browse the repository at this point in the history
Revert "[No QA] Use Ping endpoint for internet reachability instead of API root"
  • Loading branch information
mountiny authored May 15, 2023
2 parents 68068bb + 2d64b24 commit 66d42e2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 20 deletions.
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ PODS:
- React-Core
- react-native-key-command (1.0.0):
- React-Core
- react-native-netinfo (9.3.9):
- react-native-netinfo (8.3.1):
- React-Core
- react-native-pdf (6.6.2):
- React-Core
Expand Down Expand Up @@ -1085,7 +1085,7 @@ SPEC CHECKSUMS:
react-native-image-manipulator: c48f64221cfcd46e9eec53619c4c0374f3328a56
react-native-image-picker: c33d4e79f0a14a2b66e5065e14946ae63749660b
react-native-key-command: 0b3aa7c9f5c052116413e81dce33a3b2153a6c5d
react-native-netinfo: 22c082970cbd99071a4e5aa7a612ac20d66b08f0
react-native-netinfo: 1a6035d3b9780221d407c277ebfb5722ace00658
react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa
react-native-performance: 224bd53e6a835fda4353302cf891d088a0af7406
react-native-plaid-link-sdk: 9eb0f71dad94b3bdde649c7a384cba93024af46c
Expand Down
11 changes: 4 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@react-native-camera-roll/camera-roll": "5.4.0",
"@react-native-community/clipboard": "^1.5.1",
"@react-native-community/datetimepicker": "^3.5.2",
"@react-native-community/netinfo": "^9.3.9",
"@react-native-community/netinfo": "^8.3.0",
"@react-native-community/progress-bar-android": "^1.0.4",
"@react-native-community/progress-view": "^1.2.3",
"@react-native-firebase/analytics": "^12.3.0",
Expand Down
11 changes: 1 addition & 10 deletions src/libs/NetworkConnection.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,7 @@ function subscribeToNetInfo() {
// When App is served locally (or from Electron) this address is always reachable - even offline
// Using the API url ensures reachability is tested over internet
reachabilityUrl: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api`,
reachabilityMethod: 'GET',
reachabilityTest: (response) => {
if (!response.ok) {
return Promise.resolve(false);
}
return response
.json()
.then((json) => Promise.resolve(json.jsonCode === 200))
.catch(() => Promise.resolve(false));
},
reachabilityTest: (response) => Promise.resolve(response.status === 200),

// If a check is taking longer than this time we're considered offline
reachabilityRequestTimeout: CONST.NETWORK.MAX_PENDING_TIME_MS,
Expand Down

0 comments on commit 66d42e2

Please sign in to comment.