Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ android {
applicationId 'com.brewtracker.android'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 189
versionName "3.2.4"
versionCode 190
versionName "3.2.5"

buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name">BrewTracker</string>
<string name="expo_system_ui_user_interface_style" translatable="false">automatic</string>
<string name="expo_runtime_version">3.2.4</string>
<string name="expo_runtime_version">3.2.5</string>
<string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
<string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
</resources>
6 changes: 3 additions & 3 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "BrewTracker",
"slug": "brewtracker-android",
"orientation": "portrait",
"version": "3.2.4",
"version": "3.2.5",
"icon": "./assets/images/BrewTrackerAndroidLogo.png",
"scheme": "brewtracker",
"userInterfaceStyle": "automatic",
Expand All @@ -16,7 +16,7 @@
},
"edgeToEdgeEnabled": true,
"package": "com.brewtracker.android",
"versionCode": 189,
"versionCode": 190,
"permissions": [
"CAMERA",
"VIBRATE",
Expand Down Expand Up @@ -58,7 +58,7 @@
}
},
"owner": "jackmisner",
"runtimeVersion": "3.2.4",
"runtimeVersion": "3.2.5",
"updates": {
"url": "https://u.expo.dev/edf222a8-b532-4d12-9b69-4e7fbb1d41c2"
}
Expand Down
4 changes: 2 additions & 2 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
@@ -1,7 +1,7 @@
{
"name": "brewtracker",
"main": "expo-router/entry",
"version": "3.2.4",
"version": "3.2.5",
"license": "GPL-3.0-or-later",
"scripts": {
"start": "expo start",
Expand Down
9 changes: 8 additions & 1 deletion src/services/offlineV2/UserCacheService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2103,13 +2103,20 @@ export class UserCacheService {
);

// Check if this is an offline/network error - these shouldn't count as retries
// Check both error message and axios error code property
const axiosErrorCode = (error as any)?.code;
const isOfflineError =
errorMessage.includes("Simulated offline mode") ||
errorMessage.includes("Network request failed") ||
errorMessage.includes("Network Error") || // Axios network error message
errorMessage.includes("offline") ||
errorMessage.includes("ECONNREFUSED") ||
errorMessage.includes("DEPENDENCY_ERROR") ||
errorMessage.includes("Parent brew session not synced yet");
errorMessage.includes("Parent brew session not synced yet") ||
axiosErrorCode === "ERR_NETWORK" || // Axios error code property
axiosErrorCode === "ECONNREFUSED" ||
axiosErrorCode === "ETIMEDOUT" ||
axiosErrorCode === "ENOTFOUND";

if (isOfflineError) {
// Offline error - don't increment retry count, just stop syncing
Expand Down