WT 1.1.25+3 flutter 2.8, activate training plan

lib/service/api.dart

@@ -7,13 +7,28 @@ import 'package:flutter/services.dart';
 import 'package:aitrainer_app/model/cache.dart';
 
 class APIClient with Common, Logging {
+  static final APIClient _singleton = APIClient._internal();
+  late bool cert;
+
+  factory APIClient() {
+    return _singleton;
+  }
+
+  APIClient._internal() {
+    cert = false;
+  }
+
   dynamic authenticateUser(String email, String password) async {
     var url = Cache().getBaseUrl() + "authenticate";
 
     try {
       ByteData data = await rootBundle.load('asset/data/aitrainer_server.crt.pem');
       SecurityContext context = SecurityContext.defaultContext;
-      context.setTrustedCertificatesBytes(data.buffer.asUint8List(), password: "[xxxx]");
+      if (cert == false) {
+        print("Set CERT $cert");
+        context.setTrustedCertificatesBytes(data.buffer.asUint8List(), password: "[xxxx]");
+        cert = true;
+      }
 
       HttpClient client = new HttpClient(); //context: context Todo provide the right certificate
       client.badCertificateCallback = ((X509Certificate cert, String host, int port) {
@@ -52,7 +67,9 @@ class APIClient with Common, Logging {
       }
       var uri = Uri.parse(url);
       HttpClient client = new HttpClient();
+
       client.badCertificateCallback = ((X509Certificate cert, String host, int port) => true);
+
       final HttpClientRequest request = await client.postUrl(uri);
       request.headers.contentType = new ContentType("application", "json", charset: "utf-8");
       request.headers.set('Authorization', 'Bearer $authToken');
@@ -87,7 +104,9 @@ class APIClient with Common, Logging {
     var uri = Uri.parse(url);
 
     HttpClient client = new HttpClient();
+
     client.badCertificateCallback = ((X509Certificate cert, String host, int port) => true);
+
     final HttpClientRequest request = await client.getUrl(uri);
     request.headers.set('Content-Type', 'application/json');
     request.headers.set('Authorization', 'Bearer $authToken');

lib/service/customer_exercise_device_service.dart

@@ -6,7 +6,7 @@ import 'dart:convert';
 import 'api.dart';
 
 class CustomerExerciseDeviceApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<List<CustomerExerciseDevice>> getDevices(int customerId) async {
     List<CustomerExerciseDevice> devices = [];

lib/service/customer_service.dart

@@ -10,7 +10,7 @@ import 'package:aitrainer_app/service/logging.dart';
 import 'package:aitrainer_app/util/not_found_exception.dart';
 
 class CustomerApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<List<Customer>> getRealCustomers(String param) async {
     final body = await _client.get("customers/", param);

lib/service/exercise_device_service.dart

@@ -5,7 +5,7 @@ import 'package:aitrainer_app/model/exercise_device.dart';
 import 'api.dart';
 
 class ExerciseDeviceApi {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<List<ExerciseDevice>> getDevices() async {
     final body = await _client.get("exercise_device/", "");

lib/service/exercise_plan_service.dart

@@ -6,7 +6,7 @@ import 'dart:convert';
 import 'api.dart';
 
 class ExercisePlanApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<ExercisePlan> saveExercisePlan(ExercisePlan exercisePlan) async {
     String body = JsonEncoder().convert(exercisePlan.toJson());

lib/service/exercise_result_service.dart

@@ -6,7 +6,7 @@ import 'package:aitrainer_app/service/logging.dart';
 import 'api.dart';
 
 class ExerciseResultApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<void> saveExerciseResult(ExerciseResult exerciseResult) async {
     String body = JsonEncoder().convert(exerciseResult.toJson());

lib/service/exercise_service.dart

@@ -4,7 +4,7 @@ import 'package:aitrainer_app/service/api.dart';
 import 'package:aitrainer_app/service/logging.dart';
 
 class ExerciseApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<void> saveExercise(Exercise exercise) async {
     String body = JsonEncoder().convert(exercise.toJson());

lib/service/exercise_tree_service.dart

@@ -8,7 +8,7 @@ import 'package:flutter/services.dart';
 import 'api.dart';
 
 class ExerciseTreeApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<List<ExerciseTree>> getExerciseTree() async {
     final String body = await _client.get("exercise_tree", "");

lib/service/exercise_type_service.dart

@@ -6,7 +6,7 @@ import 'package:aitrainer_app/service/logging.dart';
 import 'package:flutter/services.dart';
 
 class ExerciseTypeApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<List<ExerciseType>> getExerciseTypes() async {
     final body = await _client.get("exercise_type", "");

lib/service/package_service.dart

@@ -31,7 +31,7 @@ import 'customer_service.dart';
 import 'exercise_tree_service.dart';
 
 class PackageApi {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<void> getPackage() async {
     late List<ExerciseTree> exerciseTree;

lib/service/product_service.dart

@@ -5,7 +5,7 @@ import 'package:aitrainer_app/model/product.dart';
 import 'package:aitrainer_app/service/api.dart';
 
 class ProductApi {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<List<Product>> getProducts() async {
     final body = await _client.get("product/", "");

lib/service/property_service.dart

@@ -6,7 +6,7 @@ import 'package:aitrainer_app/service/api.dart';
 import '../model/property.dart';
 
 class PropertyApi {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<List<Property>> getProperties() async {
     final body = await _client.get("property/", "");

lib/service/purchase_service.dart

@@ -6,7 +6,7 @@ import 'dart:convert';
 import 'api.dart';
 
 class PurchaseApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<List<Purchase>> getPurchasesByCustomer(int customerId) async {
     List<Purchase> purchases = [];

lib/service/sport_service.dart

@@ -6,7 +6,7 @@ import 'package:aitrainer_app/service/api.dart';
 import '../model/sport.dart';
 
 class SportApi {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<List<Sport>> getSports() async {
     final body = await _client.get("sports/", "");

lib/service/tracking_service.dart

@@ -4,7 +4,7 @@ import 'dart:convert';
 import 'api.dart';
 
 class TrackingApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<void> saveTracking(Tracking tracking) async {
     try {

lib/service/training_plan_service.dart

@@ -6,7 +6,7 @@ import 'package:aitrainer_app/service/api.dart';
 import 'package:aitrainer_app/service/logging.dart';
 
 class TrainingPlanApi with Logging {
-  final APIClient _client = new APIClient();
+  final APIClient _client = APIClient();
 
   Future<CustomerTrainingPlan> saveCustomerTrainingPlan(CustomerTrainingPlan plan) async {
     String body = JsonEncoder().convert(plan.toJson());