Skip to content

Commit d5422b2

Browse files
committed
Fixed desync and various other things
1 parent 5a31ada commit d5422b2

File tree

14 files changed

+354
-333
lines changed

14 files changed

+354
-333
lines changed

android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
2020
} catch (Exception e) {
2121
Log.e(TAG, "Error registering plugin audio_session, com.ryanheise.audio_session.AudioSessionPlugin", e);
2222
}
23-
try {
24-
flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.connectivity.ConnectivityPlugin());
25-
} catch (Exception e) {
26-
Log.e(TAG, "Error registering plugin connectivity_plus, dev.fluttercommunity.plus.connectivity.ConnectivityPlugin", e);
27-
}
2823
try {
2924
flutterEngine.getPlugins().add(new com.mr.flutter.plugin.filepicker.FilePickerPlugin());
3025
} catch (Exception e) {

android/local.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sdk.dir=/opt/homebrew/share/android-commandlinetools
22
flutter.sdk=/opt/homebrew/share/flutter
3-
flutter.buildMode=debug
3+
flutter.buildMode=release
44
flutter.versionName=1.0.0
5-
flutter.versionCode=1
5+
flutter.versionCode=1770644146

ios/Flutter/Generated.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ COCOAPODS_PARALLEL_CODE_SIGN=true
55
FLUTTER_TARGET=lib/main.dart
66
FLUTTER_BUILD_DIR=build
77
FLUTTER_BUILD_NAME=1.0.0
8-
FLUTTER_BUILD_NUMBER=1770442286
8+
FLUTTER_BUILD_NUMBER=1770644146
99
EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
1010
EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
11-
DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA0NDIyODY=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44
11+
DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2NDQxNDY=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44
1212
DART_OBFUSCATION=false
1313
TRACK_WIDGET_CREATION=false
1414
TREE_SHAKE_ICONS=true

ios/Flutter/flutter_export_environment.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export "COCOAPODS_PARALLEL_CODE_SIGN=true"
66
export "FLUTTER_TARGET=lib/main.dart"
77
export "FLUTTER_BUILD_DIR=build"
88
export "FLUTTER_BUILD_NAME=1.0.0"
9-
export "FLUTTER_BUILD_NUMBER=1770442286"
10-
export "DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA0NDIyODY=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44"
9+
export "FLUTTER_BUILD_NUMBER=1770644146"
10+
export "DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2NDQxNDY=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44"
1111
export "DART_OBFUSCATION=false"
1212
export "TRACK_WIDGET_CREATION=false"
1313
export "TREE_SHAKE_ICONS=true"

ios/Podfile.lock

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
PODS:
22
- audio_session (0.0.1):
33
- Flutter
4-
- connectivity_plus (0.0.1):
5-
- Flutter
64
- DKImagePickerController/Core (4.3.9):
75
- DKImagePickerController/ImageDataManager
86
- DKImagePickerController/Resource
@@ -71,7 +69,6 @@ PODS:
7169

7270
DEPENDENCIES:
7371
- audio_session (from `.symlinks/plugins/audio_session/ios`)
74-
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
7572
- file_picker (from `.symlinks/plugins/file_picker/ios`)
7673
- Flutter (from `Flutter`)
7774
- flutter_background_service_ios (from `.symlinks/plugins/flutter_background_service_ios/ios`)
@@ -96,8 +93,6 @@ SPEC REPOS:
9693
EXTERNAL SOURCES:
9794
audio_session:
9895
:path: ".symlinks/plugins/audio_session/ios"
99-
connectivity_plus:
100-
:path: ".symlinks/plugins/connectivity_plus/ios"
10196
file_picker:
10297
:path: ".symlinks/plugins/file_picker/ios"
10398
Flutter:
@@ -127,7 +122,6 @@ EXTERNAL SOURCES:
127122

128123
SPEC CHECKSUMS:
129124
audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
130-
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
131125
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
132126
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
133127
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be

lib/main.dart

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ void main() async {
7676
/// Load theme mode from Hive before app starts to avoid flash of wrong theme
7777
Future<String> _loadInitialThemeMode() async {
7878
try {
79-
final box = await Hive.openBox('user_preferences');
79+
final box = await Hive.openBox('user_preferences')
80+
.timeout(const Duration(seconds: 5));
8081
final json = box.get('preferences');
8182
if (json != null && json is Map) {
8283
final themeMode = json['themeMode'] as String?;
@@ -85,7 +86,13 @@ Future<String> _loadInitialThemeMode() async {
8586
}
8687
}
8788
} catch (e) {
88-
debugLog('[APP] Failed to load initial theme: $e');
89+
debugLog('[HIVE] Failed to load initial theme: $e - deleting corrupt box');
90+
// Delete corrupt box so AppStateProvider gets a clean start
91+
try {
92+
await Hive.deleteBoxFromDisk('user_preferences');
93+
} catch (_) {
94+
// Ignore delete errors
95+
}
8996
}
9097
return 'dark'; // Default to dark mode
9198
}

0 commit comments

Comments
 (0)