Fixes 9 of 10 review findings (10th requires a manual Play Console step, no code change): 1. app.dart/banner_anuncio_superior.dart: move the top SafeArea inside BannerAnuncioSuperior so it only reserves status-bar height when an ad actually renders, restoring edge-to-edge layout for premium and free-unloaded users. 2. servicio_anuncios.dart: bound every interstitial await (load, presentation, and the injected implementation itself) with injectable timeouts so a callback that never fires can no longer hang a caller. 3. estado_entitlement.dart/hoja_premium.dart: expose a typed resultadoUsuario signal for purchase/restore failures and restore-found-nothing, with dedicated localized messages (compraError, restauracionSinCompras) across all 13 locales -- never the raw developer/exception string. 4. main.dart/servicio_consentimiento.dart: add a GDPR/UMP consent flow (ConsentInformation/ConsentForm) that gates Mobile Ads SDK init on canRequestAds(); premium users never see a consent form; failures degrade to no ads instead of crashing or blocking startup. 6. servicio_anuncios.dart: track real ad presentation (onAdShowedFullScreenContent) so a failed-to-show interstitial no longer consumes a session cap slot. 7. banner_anuncio_superior.dart: add an explicit load-attempted guard so repeated didChangeDependencies (e.g. entitlement notifyListeners during a purchase) can only ever trigger one banner load attempt. 8. servicio_anuncios.dart: make esPremium a required constructor parameter, matching the hardened contract already applied to EstadoAlarmas/EstadoGrabacion/EstadoRadio. 9. hoja_premium.dart: add a dedicated premiumActivo localized string instead of reusing the equalizer's equalizerActive translation, across all 13 locales. All fixes implemented RED-first (failing test before production code). Full suite: 1261 passed, 2 pre-existing skips, 0 failures. flutter analyze: 5 pre-existing issues only, 0 new. [version set]
107 lines
3.9 KiB
Dart
107 lines
3.9 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:flutter/foundation.dart' show debugPrint;
|
|
import 'package:google_mobile_ads/google_mobile_ads.dart';
|
|
|
|
/// GDPR/UMP consent I/O abstraction (FIX 4, code review): every other file
|
|
/// depends on this port, never on the `google_mobile_ads` UMP classes
|
|
/// (`ConsentInformation`, `ConsentForm`) directly — matches
|
|
/// `PuertoCompras`'s injection shape, and keeps this testable with zero
|
|
/// AdMob/UMP platform channels in unit tests.
|
|
abstract class PuertoConsentimiento {
|
|
/// Requests consent info, loads-and-shows the consent form if required,
|
|
/// and resolves whether ads may be requested afterwards
|
|
/// (`ConsentInformation.canRequestAds()`). Implementations must NEVER
|
|
/// throw — any underlying failure degrades to `false` (no ads served),
|
|
/// never crashes or blocks the caller.
|
|
Future<bool> resolver();
|
|
}
|
|
|
|
/// The SOLE UMP call site (FIX 4) — every other file depends on
|
|
/// [PuertoConsentimiento] instead.
|
|
class ServicioConsentimientoUmp implements PuertoConsentimiento {
|
|
ServicioConsentimientoUmp({
|
|
ConsentRequestParameters? parametros,
|
|
Duration? timeoutActualizacion,
|
|
}) : _parametros = parametros ?? ConsentRequestParameters(),
|
|
_timeoutActualizacion =
|
|
timeoutActualizacion ?? const Duration(seconds: 10);
|
|
|
|
final ConsentRequestParameters _parametros;
|
|
final Duration _timeoutActualizacion;
|
|
|
|
@override
|
|
Future<bool> resolver() async {
|
|
try {
|
|
// 1. Request an up-to-date consent status. FIX 2's lesson applies
|
|
// here too: bound the callback-based wait so a callback that never
|
|
// fires cannot hang startup.
|
|
final actualizacionCompleter = Completer<void>();
|
|
ConsentInformation.instance.requestConsentInfoUpdate(
|
|
_parametros,
|
|
() {
|
|
if (!actualizacionCompleter.isCompleted) {
|
|
actualizacionCompleter.complete();
|
|
}
|
|
},
|
|
(error) {
|
|
debugPrint(
|
|
'[PluriWave][consentimiento] requestConsentInfoUpdate ERROR '
|
|
'${error.message}',
|
|
);
|
|
if (!actualizacionCompleter.isCompleted) {
|
|
actualizacionCompleter.complete();
|
|
}
|
|
},
|
|
);
|
|
await actualizacionCompleter.future.timeout(
|
|
_timeoutActualizacion,
|
|
onTimeout: () {},
|
|
);
|
|
|
|
// 2. Load-and-show the consent form ONLY IF the UMP SDK itself
|
|
// determines it is required (EEA/UK traffic, no prior valid
|
|
// consent) — this single call is a no-op everywhere else.
|
|
await ConsentForm.loadAndShowConsentFormIfRequired((formError) {
|
|
if (formError != null) {
|
|
debugPrint(
|
|
'[PluriWave][consentimiento] '
|
|
'loadAndShowConsentFormIfRequired ERROR ${formError.message}',
|
|
);
|
|
}
|
|
});
|
|
|
|
// 3. The only gate that matters for the caller: may ads be
|
|
// requested at all right now?
|
|
return await ConsentInformation.instance.canRequestAds();
|
|
} catch (e) {
|
|
debugPrint('[PluriWave][consentimiento] ERROR $e');
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Orchestrates the whole gate (FIX 4): premium users NEVER see a consent
|
|
/// form at all — they get zero ads regardless of consent — so
|
|
/// [PuertoConsentimiento] is never even touched for them. Free-tier users
|
|
/// get the real flow, with any failure degrading silently to "ads not
|
|
/// allowed" rather than crashing or blocking `main()`.
|
|
Future<bool> resolverConsentimientoAnuncios({
|
|
required bool esPremium,
|
|
required PuertoConsentimiento consentimiento,
|
|
}) async {
|
|
if (esPremium) return false;
|
|
try {
|
|
return await consentimiento.resolver();
|
|
} catch (e) {
|
|
// Defense in depth: [PuertoConsentimiento.resolver] is documented to
|
|
// never throw, but a caller-provided implementation (fake or future
|
|
// adapter) failing to honor that contract still may not crash or block
|
|
// `main()`.
|
|
debugPrint(
|
|
'[PluriWave][consentimiento] resolverConsentimientoAnuncios ERROR $e',
|
|
);
|
|
return false;
|
|
}
|
|
}
|