diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 070597d..f187ebd 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,9 +10,9 @@
toJson() => {'errorCode': errorCode, 'errorMessage': errorMessage, 'errorType': errorType,};
+ Map toJson() => {
+ 'errorCode': errorCode,
+ 'errorMessage': errorMessage,
+ 'errorType': errorType,
+ };
@override
String toString() {
@@ -79,28 +83,30 @@ class ApiClient {
print("body:$bodyJson");
}
var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: _headers, retryTimes: retryTimes, isFormData: isFormData);
- // try {
- if (!kReleaseMode) {
- logger.i("res: " + response.body);
- }
- var jsonData = jsonDecode(response.body);
- if (jsonData["IsAuthenticated"] != null) {
- AppState().setIsAuthenticated = jsonData["IsAuthenticated"];
- }
- if (jsonData["ErrorMessage"] == null) {
- return factoryConstructor(jsonData);
- } else {
- APIError? apiError;
- apiError = APIError(jsonData['ErrorCode'], jsonData['ErrorEndUserMessage'], jsonData['ErrorType']);
- throw APIException(APIException.BAD_REQUEST, error: apiError);
+ try {
+ if (!kReleaseMode) {
+ logger.i("res: " + response.body);
+ }
+ var jsonData = jsonDecode(response.body);
+ if (jsonData["MessageStatus"] == 2) {
+ AppState().setIsAuthenticated = false;
+ }
+
+
+ if (jsonData["ErrorMessage"] == null && jsonData["MessageStatus"] == 1) {
+ return factoryConstructor(jsonData);
+ } else {
+ APIError? apiError;
+ apiError = APIError(jsonData['ErrorCode'], jsonData['ErrorEndUserMessage'], jsonData['ErrorType'] ?? 0);
+ throw APIException(APIException.BAD_REQUEST, error: apiError);
+ }
+ } catch (ex) {
+ if (ex is APIException) {
+ rethrow;
+ } else {
+ throw APIException(APIException.BAD_RESPONSE_FORMAT, arguments: ex);
+ }
}
- // } catch (ex) {
- // if (ex is APIException) {
- // rethrow;
- // } else {
- // throw APIException(APIException.BAD_RESPONSE_FORMAT, arguments: ex);
- // }
- // }
}
Future postJsonForResponse(String url, T jsonObject,
diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart
index 56b0008..96fd4b0 100644
--- a/lib/classes/consts.dart
+++ b/lib/classes/consts.dart
@@ -4,7 +4,7 @@ class ApiConsts {
//static String baseUrl = "http://10.200.204.20:2801/"; // Local server
// static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
// static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
- static String baseUrl = "https://hmgwebservices.com"; // Live server
+ static String baseUrl = "https://hmgwebservices.com"; // Live server
static String baseUrlServices = baseUrl + "/Services/"; // server
// static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";
@@ -44,7 +44,6 @@ class ApiConsts {
static int tabletMinLength = 500;
}
-
class SharedPrefsConsts {
static String isRememberMe = "remember_me";
static String username = "username";
diff --git a/lib/classes/notifications.dart b/lib/classes/notifications.dart
index b7d7988..336b87c 100644
--- a/lib/classes/notifications.dart
+++ b/lib/classes/notifications.dart
@@ -37,7 +37,7 @@ class AppNotifications {
void initNotification(String? firebaseToken) async {
// await requestPermissions();
- AppState().deviceNotificationToken = firebaseToken;
+ AppState().setDeviceToken = firebaseToken;
// await Permission.notification.isDenied.then((value) {
// if (value) {
// Permission.notification.request();
diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart
index f01aa0d..1563767 100644
--- a/lib/generated/codegen_loader.g.dart
+++ b/lib/generated/codegen_loader.g.dart
@@ -6,1048 +6,1063 @@ import 'dart:ui';
import 'package:easy_localization/easy_localization.dart' show AssetLoader;
-class CodegenLoader extends AssetLoader {
+class CodegenLoader extends AssetLoader{
const CodegenLoader();
@override
- Future