mirror of
https://github.com/mattermost/mattermost-mobile.git
synced 2026-11-04 18:08:54 +00:00
* Expo-Router partial migration * Full migration to ExpoRouter * i18n * add tests * Merge branch 'main' into expo-router * align package-lock.json * i18n * feedback review * feedback review * android 16kb patch * Refactored emoji picker keyboard using a state machine * set android launch_screen in drawables instead of layout * no conditional hooks * remove duplicate call in test * address feedback * fix tests and address more feedback * small corrections * small corrections * small corrections * fix draft test * fix draft test 2 * remove navigateToScreen in draff test * fix nit in draft test * remove doc file * Feedback review * fix snapshots * improve test coverage * fix i18n * Upgrade t o RN 0.83, other dependencies and new architecture (#9737) * library hardware-keyboard android new arch support fix * library rnshare android new arch support fix * library rnutils android new arch support fix * library secure-pdf-viewer add new arch support * Enable new arch on iOS and Android * update emm and network client with new-arch * update intune to use new-arch * performance improvements * fix tests * fixes post input on new-arch * fix android emoji picker * remove doc * run tests in parallel * upgrade to React Native 0.83.9, Expo 55, React 19, and New Architecture Bumps core dependencies to their latest versions: - React Native 0.77.3 → 0.83.9 (New Architecture enabled) - React 18.3.1 → 19.2.5 - Expo SDK 52 → 55 - TypeScript 5.8.3 → 6.0.3 - Node.js 22.16.0 → 24.15.0 - react-native-reanimated 3.17.3 → 4.3.0 - Various other dependency upgrades Migrates iOS AppDelegate from Objective-C to Swift, updates Android build tooling and Gradle wrapper, refreshes all patches and font assets, and adapts app code, tests, and CI workflows throughout for API changes introduced by these upgrades. * remove unecessary dismissKeyboard in notifications * feedback review * update intune to use new-arch * update @mattermost deps * missing i18n string * additional fixes * update fastlane
56 lines
3.2 KiB
Diff
56 lines
3.2 KiB
Diff
diff --git a/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetworkCallbackConnectivityReceiver.java b/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetworkCallbackConnectivityReceiver.java
|
|
index 252d1e7..09328c5 100644
|
|
--- a/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetworkCallbackConnectivityReceiver.java
|
|
+++ b/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetworkCallbackConnectivityReceiver.java
|
|
@@ -91,14 +91,14 @@ public class NetworkCallbackConnectivityReceiver extends ConnectivityReceiver {
|
|
// Get the connection type
|
|
if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH)) {
|
|
connectionType = ConnectionType.BLUETOOTH;
|
|
+ } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
|
|
+ connectionType = ConnectionType.VPN;
|
|
} else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
|
|
connectionType = ConnectionType.CELLULAR;
|
|
} else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) {
|
|
connectionType = ConnectionType.ETHERNET;
|
|
} else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
|
|
connectionType = ConnectionType.WIFI;
|
|
- } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
|
|
- connectionType = ConnectionType.VPN;
|
|
}
|
|
|
|
if (network != null) {
|
|
diff --git a/node_modules/@react-native-community/netinfo/src/internal/internetReachability.ts b/node_modules/@react-native-community/netinfo/src/internal/internetReachability.ts
|
|
index 7d396aa..ebc49be 100644
|
|
--- a/node_modules/@react-native-community/netinfo/src/internal/internetReachability.ts
|
|
+++ b/node_modules/@react-native-community/netinfo/src/internal/internetReachability.ts
|
|
@@ -108,10 +108,10 @@ export default class InternetReachability {
|
|
const nextTimeoutInterval = this._isInternetReachable
|
|
? this._configuration.reachabilityLongTimeout
|
|
: this._configuration.reachabilityShortTimeout;
|
|
- this._currentTimeoutHandle = setTimeout(
|
|
- this._checkInternetReachability,
|
|
- nextTimeoutInterval,
|
|
- );
|
|
+ // this._currentTimeoutHandle = setTimeout(
|
|
+ // this._checkInternetReachability,
|
|
+ // nextTimeoutInterval,
|
|
+ // );
|
|
})
|
|
.catch((error: Error | 'timedout' | 'canceled'): void => {
|
|
if ('canceled' === error) {
|
|
@@ -122,10 +122,10 @@ export default class InternetReachability {
|
|
}
|
|
|
|
this._setIsInternetReachable(false);
|
|
- this._currentTimeoutHandle = setTimeout(
|
|
- this._checkInternetReachability,
|
|
- this._configuration.reachabilityShortTimeout,
|
|
- );
|
|
+ // this._currentTimeoutHandle = setTimeout(
|
|
+ // this._checkInternetReachability,
|
|
+ // this._configuration.reachabilityShortTimeout,
|
|
+ // );
|
|
}
|
|
})
|
|
// Clear request timeout and propagate any errors
|