6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 8a3ed438

AuthorNKL<nikolaj.king@gmail.com>
Date2025-07-09 11:27:19 +0200
fixed small android build errors, added google.json

Changed files

comwell_key_app/android/app/build.gradle                | 11 +++--------
 comwell_key_app/lib/force_update/force_update_page.dart |  6 ++----
 .../interceptors/response_handle_interceptor.dart       | 17 ++++++++++-------
 3 files changed, 15 insertions(+), 19 deletions(-)

Diff

diff --git a/comwell_key_app/android/app/build.gradle b/comwell_key_app/android/app/build.gradle
index 3ee20326..2c689b19 100644
--- a/comwell_key_app/android/app/build.gradle
+++ b/comwell_key_app/android/app/build.gradle
@@ -90,22 +90,17 @@ android {
productFlavors{
- develop {
+ Develop {
dimension = "env"
resValue "string", "app_name", "Comwell Phoenix Dev"
applicationIdSuffix = ".dev"
}
- test {
- dimension = "env"
- resValue "string", "app_name", "Comwell Phoenix Test"
- applicationIdSuffix = ".test"
- }
- stage {
+ Stage {
dimension = "env"
resValue "string", "app_name", "Comwell Phoenix Stage"
applicationIdSuffix = ".stage"
}
- prod {
+ Prod {
dimension = "env"
resValue "string", "app_name", "Comwell Phoenix"
}
diff --git a/comwell_key_app/lib/force_update/force_update_page.dart b/comwell_key_app/lib/force_update/force_update_page.dart
index 49fe201c..7c4ad3d2 100644
--- a/comwell_key_app/lib/force_update/force_update_page.dart
+++ b/comwell_key_app/lib/force_update/force_update_page.dart
@@ -31,8 +31,7 @@ class ForceUpdatePage extends StatelessWidget {
fit: BoxFit.cover,
),
),
- child: SafeArea(
- child: Column(
+ child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
// Logo
@@ -88,11 +87,10 @@ class ForceUpdatePage extends StatelessWidget {
: Text('force_update_button'.tr()),
),
),
- const SizedBox(height: 20),
+ const SizedBox(height: 60),
],
),
),
- ),
);
},
),
diff --git a/comwell_key_app/lib/services/interceptors/response_handle_interceptor.dart b/comwell_key_app/lib/services/interceptors/response_handle_interceptor.dart
index bbf83fb1..6e0d6c74 100644
--- a/comwell_key_app/lib/services/interceptors/response_handle_interceptor.dart
+++ b/comwell_key_app/lib/services/interceptors/response_handle_interceptor.dart
@@ -52,11 +52,13 @@ class ResponseHandleInterceptor extends Interceptor {
DioException err,
ErrorInterceptorHandler handler,
) async {
+ // TEMP: Always treat as 426 for testing force update
+
final response = err.response;
if (response == null) {
return handler.next(DioException(
- message: "Missing response ${err.response}",
+ message: "Missing response \\${err.response}",
requestOptions: RequestOptions(),
));
}
@@ -93,10 +95,11 @@ class ResponseHandleInterceptor extends Interceptor {
} else if (statusCode == 426) {
// Navigate to force update page
final navigatorKey = locator<GlobalKey<NavigatorState>>();
- navigatorKey.currentState?.pushNamedAndRemoveUntil(
- '/force_update',
- (route) => false,
- );
+ final context = navigatorKey.currentContext;
+ if (context != null) {
+ GoRouter.of(context).go('/forceUpdate');
+ }
+
final err = DioException(
requestOptions: response.requestOptions, error: 'Update required');
handler.next(err);
@@ -104,13 +107,13 @@ class ResponseHandleInterceptor extends Interceptor {
final err = DioException(
requestOptions: response.requestOptions,
error:
- 'HTTP request error, status code: ${response.statusCode} - message: ${response.data['detail']}');
+ 'HTTP request error, status code: \\${response.statusCode} - message: \\${response.data['detail']}');
handler.next(err);
}
} catch (e) {
final err = DioException(
requestOptions: response.requestOptions,
- error: 'Failed to handle the response: $e');
+ error: 'Failed to handle the response: \\${e}');
handler.next(err);
}
}