OSAM-21806-common-module-issues

Author: Alberto Aguilar

CHANGELOG.md

@@ -1,7 +1,7 @@
-## 8.1.9-dev
+## 8.1.10-dev
 
 * UPDATED NATIVE LIBRARIES
-    * Updated [modul_comu_osam library](https://github.com/AjuntamentdeBarcelona/modul_comu_osam) to version 3.1.6-dev.
+    * Updated [modul_comu_osam library](https://github.com/AjuntamentdeBarcelona/modul_comu_osam) to version 3.1.13-dev.
 * IMPROVED POPUP INTERACTION
     * Added transparent barriers and PopScope in `AlertWrapper` and `UIHelper` to prevent background interaction while native or custom popups are being shown.
     * Changed default language fallback to English (`en`).
@@ -19,7 +19,7 @@
     * Added UIHelper and OSAMDialog widget in the Flutter part.
     * Updated example app with "Custom Flutter Popup" button to test the new UI.
 
-## 8.1.1-dev
+## 8.1.2-dev
 
 * BREAKING CHANGES
     * Updated [modul_comu_osam library](https://github.com/AjuntamentdeBarcelona/modul_comu_osam) to version 3.0.1-dev accessible popup.

README.md

@@ -41,7 +41,7 @@ A partir de la versió 3.0.0 la llibreria es un wrapper de la [desenvolupada en
     osam_common_module_flutter:
       git:
         url: https://github.com/AjuntamentdeBarcelona/modul_comu_osam_flutter.git
-        ref: '8.1.9-dev'
+        ref: '8.1.10-dev'
     ```
 
     En cas que les dependències de Firebase Analytics, Firebase Performance, Firebase Messaging i Firebase Crashlytics fallin, cal afegir aquestes aquesta configuració al pubspec:

android/build.gradle

@@ -49,7 +49,7 @@ android {
 
 dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0-native-mt")
-    implementation("com.github.AjuntamentdeBarcelona.modul_comu_osam:common:3.1.6-dev")
+    implementation("com.github.AjuntamentdeBarcelona.modul_comu_osam:common:3.1.13-dev")
     implementation("com.google.code.gson:gson:2.10.1")
 
     implementation(platform("com.google.firebase:firebase-bom:33.6.0"))

example/ios/Podfile

@@ -32,7 +32,7 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  pod 'OSAMCommon', :git => 'https://github.com/AjuntamentdeBarcelona/modul_comu_osam.git', :tag => '3.1.6-dev'
+  pod 'OSAMCommon', :git => 'https://github.com/AjuntamentdeBarcelona/modul_comu_osam.git', :tag => '3.1.13-dev'
 end
 
 post_install do |installer|

example/ios/Runner/Info.plist

@@ -49,5 +49,11 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>Allow Flutter to discover the local network for debugging.</string>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_dartobservatory._tcp</string>
+	</array>
 </dict>
 </plist>

example/lib/actions_screen.dart

@@ -1,3 +1,4 @@
+import 'package:common_module_flutter_example/data/osam/osam_repository_impl.dart';
 import 'package:flutter/material.dart';
 import 'package:osam_common_module_flutter/osam_common_module_flutter.dart';
 
@@ -76,6 +77,10 @@ class ActionsScreenState extends State<ActionsScreen> {
   }
 
   void _onVersionControl() async {
+    if (DI.osamRepository is OsamRepositoryImpl) {
+      (DI.osamRepository as OsamRepositoryImpl)
+          .setAlertWrapper(AlertWrapper(context));
+    }
     final result = await DI.osamRepository.checkForUpdates();
 
     if (mounted) {
@@ -97,6 +102,10 @@ class ActionsScreenState extends State<ActionsScreen> {
   }
 
   void _onRating() async {
+    if (DI.osamRepository is OsamRepositoryImpl) {
+      (DI.osamRepository as OsamRepositoryImpl)
+          .setAlertWrapper(AlertWrapper(context));
+    }
     final result = await DI.osamRepository.checkRating();
 
     if (mounted) {

example/lib/data/osam/osam_repository_impl.dart

@@ -1,4 +1,5 @@
 import 'dart:ui';
+import 'package:flutter/foundation.dart';
 import 'package:osam_common_module_flutter/osam_common_module_flutter.dart';
 import 'package:common_module_flutter_example/data/interfaces.dart';
 import 'package:common_module_flutter_example/model/language.dart'
@@ -7,87 +8,144 @@ import 'package:common_module_flutter_example/model/language.dart'
 class OsamRepositoryImpl extends OsamRepository {
   final OSAM osamSdk;
   final Settings settings;
+  AlertWrapper? alertWrapper;
+
+  Future<VersionControlResponse>? _checkForUpdatesFuture;
+  Future<RatingControlResponse>? _checkRatingFuture;
 
   OsamRepositoryImpl(
     this.osamSdk,
     this.settings,
   );
 
+  void setAlertWrapper(AlertWrapper wrapper) {
+    alertWrapper = wrapper;
+  }
+
   @override
   Future<VersionControlResponse> checkForUpdates() async {
-    final response = await osamSdk.versionControl(
-      language: _getLanguage(settings.getLanguage()),
-      isDarkMode:
-          PlatformDispatcher.instance.platformBrightness == Brightness.dark,
-    );
-    print("checkForUpdates response: $response");
-    return response;
+    if (_checkForUpdatesFuture != null) {
+      debugPrint("OsamRepository: already checking, waiting...");
+      return _checkForUpdatesFuture!;
+    }
+
+    _checkForUpdatesFuture = _doCheckForUpdates();
+    try {
+      return await _checkForUpdatesFuture!;
+    } finally {
+      _checkForUpdatesFuture = null;
+    }
+  }
+
+  Future<VersionControlResponse> _doCheckForUpdates() async {
+    try {
+      final language = _getLanguage(settings.getLanguage());
+      final isDark =
+          PlatformDispatcher.instance.platformBrightness == Brightness.dark;
+
+      debugPrint(
+          "OsamRepository: Requesting versionControl (lang: ${language.toLanguageCode()}, dark: $isDark)");
+
+      if (alertWrapper != null) {
+        return await alertWrapper!.showVersionControlNative(
+          osam: osamSdk,
+          language: language,
+          isDarkMode: isDark,
+        );
+      }
+
+      final response = await osamSdk.versionControl(
+        language: language,
+        isDarkMode: isDark,
+      );
+
+      debugPrint("OsamRepository: versionControl response = $response");
+      return response;
+    } catch (e) {
+      debugPrint("OsamRepository: versionControl error = $e");
+      return VersionControlResponse.ERROR;
+    }
   }
 
   @override
   Future<RatingControlResponse> checkRating() async {
-    return osamSdk.rating(
-      language: _getLanguage(settings.getLanguage()),
-      isDarkMode:
-          PlatformDispatcher.instance.platformBrightness == Brightness.dark,
-    );
+    if (_checkRatingFuture != null) {
+      debugPrint("OsamRepository: already checking rating, waiting...");
+      return _checkRatingFuture!;
+    }
+
+    _checkRatingFuture = _doCheckRating();
+    try {
+      return await _checkRatingFuture!;
+    } finally {
+      _checkRatingFuture = null;
+    }
+  }
+
+  Future<RatingControlResponse> _doCheckRating() async {
+    try {
+      final language = _getLanguage(settings.getLanguage());
+      final isDark =
+          PlatformDispatcher.instance.platformBrightness == Brightness.dark;
+
+      debugPrint(
+          "OsamRepository: Requesting rating (lang: ${language.toLanguageCode()}, dark: $isDark)");
+
+      if (alertWrapper != null) {
+        return await alertWrapper!.showRating(
+          osam: osamSdk,
+          language: language,
+          isDarkMode: isDark,
+        );
+      }
+
+      final response = await osamSdk.rating(
+        language: language,
+        isDarkMode: isDark,
+      );
+
+      debugPrint("OsamRepository: rating response = $response");
+      return response;
+    } catch (e) {
+      debugPrint("OsamRepository: rating error = $e");
+      return RatingControlResponse.ERROR;
+    }
   }
 
   Language _getLanguage(app_language.AppLanguage appLanguage) {
-    Language language;
     switch (appLanguage) {
       case app_language.AppLanguage.ES:
-        language = Language.ES;
-        break;
+        return Language.ES;
       case app_language.AppLanguage.CA:
-        language = Language.CA;
-        break;
+        return Language.CA;
       case app_language.AppLanguage.EN:
-        language = Language.EN;
-        break;
-      default:
-        language = Language.EN;
-        break;
+        return Language.EN;
     }
-    return language;
   }
 
   @override
-  Future<DeviceInformation> deviceInformation() {
-    return osamSdk.deviceInformation();
-  }
+  Future<DeviceInformation> deviceInformation() => osamSdk.deviceInformation();
 
   @override
-  Future<AppInformation> appInformation() {
-    return osamSdk.appInformation();
-  }
+  Future<AppInformation> appInformation() => osamSdk.appInformation();
 
   @override
-  Future<AppLanguageResponse> changeLanguageEvent() {
-    return osamSdk.changeLanguageEvent(
-      language: _getLanguage(settings.getLanguage()),
-    );
-  }
+  Future<AppLanguageResponse> changeLanguageEvent() => osamSdk
+      .changeLanguageEvent(language: _getLanguage(settings.getLanguage()));
 
   @override
-  Future<AppLanguageResponse> firstTimeOrUpdateEvent() {
-    return osamSdk.firstTimeOrUpdateAppEvent(
-      language: _getLanguage(settings.getLanguage()),
-    );
-  }
+  Future<AppLanguageResponse> firstTimeOrUpdateEvent() =>
+      osamSdk.firstTimeOrUpdateAppEvent(
+          language: _getLanguage(settings.getLanguage()));
 
   @override
-  Future<SubscriptionResponse> subscribeToCustomTopic() {
-    return osamSdk.subscribeToCustomTopic(topic: "TestTopic");
-  }
+  Future<SubscriptionResponse> subscribeToCustomTopic() =>
+      osamSdk.subscribeToCustomTopic(topic: "TestTopic");
 
   @override
-  Future<SubscriptionResponse> unsubscribeToCustomTopic() {
-    return osamSdk.unsubscribeToCustomTopic(topic: "TestTopic");
-  }
+  Future<SubscriptionResponse> unsubscribeToCustomTopic() =>
+      osamSdk.unsubscribeToCustomTopic(topic: "TestTopic");
 
   @override
-  Future<TokenResponse> getFCMToken() {
-    return osamSdk.getFCMToken();
-  }
+  Future<TokenResponse> getFCMToken() => osamSdk.getFCMToken();
 }