CalvinBackup/deflock-app
1
0
Fork 0
mirror of https://github.com/FoggedLens/deflock-app.git synced 2026-07-09 22:18:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Force simulate mode when OSM OAuth secrets are missing

Browse Source 
Preview/PR builds don't have access to GitHub Secrets, so the OAuth
client IDs are empty. Previously this caused a runtime crash from
keys.dart throwing on empty values. Now we detect missing secrets
and force simulate mode, which already fully supports fake auth
and uploads.

Also fixes a latent bug where forceLogin() would crash with
LateInitializationError in simulate mode since _helper is never
initialized when OAuth setup is skipped.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Doug Borg
2026-03-07 11:02:41 -07:00
parent aeb1903bbc
commit 5728b4f70f
5 changed files with 106 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/state/settings_state.dart
+17 -8
View File
@@ -5,6 +5,7 @@ import 'package:collection/collection.dart';
import '../models/tile_provider.dart';
import '../dev_config.dart';
import '../keys.dart';
// Enum for upload mode (Production, OSM Sandbox, Simulate)
enum UploadMode { production, sandbox, simulate }
@@ -41,7 +42,8 @@ class SettingsState extends ChangeNotifier {
bool _offlineMode = false;
bool _pauseQueueProcessing = false;
int _maxNodes = kDefaultMaxNodes;
UploadMode _uploadMode = kEnableDevelopmentModes ? UploadMode.simulate : UploadMode.production;
// Default must account for missing secrets (preview builds) even before init() runs
UploadMode _uploadMode = (kEnableDevelopmentModes || !kHasOsmSecrets) ? UploadMode.simulate : UploadMode.production;
FollowMeMode _followMeMode = FollowMeMode.follow;
bool _proximityAlertsEnabled = false;
int _proximityAlertDistance = kProximityAlertDefaultDistance;
@@ -150,8 +152,16 @@ class SettingsState extends ChangeNotifier {
await prefs.setInt(_uploadModePrefsKey, _uploadMode.index);
}
// In production builds, force production mode if development modes are disabled
if (!kEnableDevelopmentModes && _uploadMode != UploadMode.production) {
// Override persisted upload mode when the current build configuration
// doesn't support it. This handles two cases:
// 1. Preview/PR builds without OAuth secrets — force simulate to avoid crashes
// 2. Production builds — force production (prefs may have sandbox/simulate
// from a previous dev build on the same device)
if (!kHasOsmSecrets && _uploadMode != UploadMode.simulate) {
debugPrint('SettingsState: No OSM secrets available, forcing simulate mode');
_uploadMode = UploadMode.simulate;
await prefs.setInt(_uploadModePrefsKey, _uploadMode.index);
} else if (kHasOsmSecrets && !kEnableDevelopmentModes && _uploadMode != UploadMode.production) {
debugPrint('SettingsState: Development modes disabled, forcing production mode');
_uploadMode = UploadMode.production;
await prefs.setInt(_uploadModePrefsKey, _uploadMode.index);
@@ -258,11 +268,10 @@ class SettingsState extends ChangeNotifier {
}
Future<void> setUploadMode(UploadMode mode) async {
// In production builds, only allow production mode
if (!kEnableDevelopmentModes && mode != UploadMode.production) {
debugPrint('SettingsState: Development modes disabled, forcing production mode');
mode = UploadMode.production;
}
// The upload mode dropdown is only visible when kEnableDevelopmentModes is
// true (gated in osm_account_screen.dart), so no secrets/dev-mode guards
// are needed here. The init() method handles forcing the correct mode on
// startup for production builds and builds without OAuth secrets.
_uploadMode = mode;
final prefs = await SharedPreferences.getInstance();