Merge branch 'develop'

invoiceninja · Nov 13, 2022 · b5d2d60 · b5d2d60
2 parents fc4defd + 45a9d70
commit b5d2d60
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 76 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,6 +1,7 @@
 // Dart imports:
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
 // Flutter imports:
 import 'package:flutter/foundation.dart';
@@ -61,9 +62,51 @@ import 'package:window_manager/window_manager.dart';
 import 'package:invoiceninja_flutter/utils/web_stub.dart'
  if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart';
 
+// https://github.com/dart-lang/io/issues/83#issuecomment-940617222
+const isrgRootX1 = '''-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+''';
+
 void main({bool isTesting = false}) async {
  WidgetsFlutterBinding.ensureInitialized();
 
+ try {
+ SecurityContext.defaultContext.setTrustedCertificatesBytes(
+ Uint8List.fromList(isrgRootX1.codeUnits),
+ );
+ } catch (e) {
+ // Ignore CERT_ALREADY_IN_HASH_TABLE
+ }
+
  if (isDesktopOS()) {
  await windowManager.ensureInitialized();
 

diff --git a/lib/ui/app/review_app.dart b/lib/ui/app/review_app.dart
@@ -4,7 +4,6 @@ import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
-import 'package:invoiceninja_flutter/ui/app/menu_drawer.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:invoiceninja_flutter/utils/app_review.dart';
@@ -18,17 +17,6 @@ class ReviewApp extends StatefulWidget {
 }
 
 class _ReviewAppState extends State<ReviewApp> {
- bool _likesTheApp;
-
- @override
- void initState() {
- super.initState();
-
- if (isApple()) {
- _likesTheApp = true;
- }
- }
-
  @override
  Widget build(BuildContext context) {
  final localization = AppLocalization.of(context);
@@ -38,25 +26,14 @@ class _ReviewAppState extends State<ReviewApp> {
  return SizedBox();
  }
 
- // TODO remove this code
- if (isWindows()) {
- return SizedBox();
- }
-
  return Padding(
  padding: const EdgeInsets.only(top: 8),
  child: FormCard(
  crossAxisAlignment: CrossAxisAlignment.center,
  children: [
  SizedBox(height: 12),
  Text(
- isApple()
- ? localization.wouldYouRateTheApp
- : _likesTheApp == null
- ? localization.areYouEnjoyingTheApp
- : _likesTheApp == true
- ? localization.wouldYouRateIt
- : localization.wouldYouTellUsMore,
+ localization.wouldYouRateTheApp,
  style: Theme.of(context).textTheme.subtitle1,
  textAlign: TextAlign.center,
  ),
@@ -65,63 +42,40 @@ class _ReviewAppState extends State<ReviewApp> {
  children: [
  TextButton(
  onPressed: () async {
- if (_likesTheApp == null) {
- setState(() {
- _likesTheApp = true;
- });
+ // TODO remove this code: https://github.com/britannio/in_app_review/issues/56
+ if (isAndroid()) {
+ AppReview.openStoreListing();
+ } else if (await AppReview.isAvailable()) {
+ AppReview.requestReview();
+ } else if (kIsWeb || isLinux()) {
+ launchUrl(Uri.parse(getRateAppURL(context)));
  } else {
- if (_likesTheApp == true) {
- // TODO remove this code: https://github.com/britannio/in_app_review/issues/56
- if (isAndroid()) {
- AppReview.openStoreListing();
- } else if (await AppReview.isAvailable()) {
- AppReview.requestReview();
- } else if (kIsWeb || isLinux()) {
- launchUrl(Uri.parse(getRateAppURL(context)));
- } else {
- AppReview.openStoreListing();
- }
- } else {
- showDialog<void>(
- context: context,
- builder: (BuildContext context) => ContactUsDialog(),
- );
- }
-
- store.dispatch(DismissReviewAppPermanently());
+ AppReview.openStoreListing();
  }
+
+ store.dispatch(DismissReviewAppPermanently());
  },
  child: ConstrainedBox(
  constraints: const BoxConstraints(minWidth: 100),
  child: Padding(
  padding: const EdgeInsets.symmetric(vertical: 16),
  child: Text(
- _likesTheApp == null
- ? localization.yesItsGreat
- : localization.sureHappyTo,
+ localization.sureHappyTo,
  textAlign: TextAlign.center,
  ),
  ),
  ),
  ),
  TextButton(
  onPressed: () async {
- if (_likesTheApp == null) {
- setState(() {
- _likesTheApp = false;
- });
- } else {
- store.dispatch(DismissReviewAppPermanently());
- }
+ store.dispatch(DismissReviewAppPermanently());
  },
  child: ConstrainedBox(
  constraints: const BoxConstraints(minWidth: 100),
  child: Padding(
  padding: const EdgeInsets.symmetric(vertical: 16),
  child: Text(
- _likesTheApp == null
- ? localization.notSoMuch
- : localization.noNotNow,
+ localization.noNotNow,
  textAlign: TextAlign.center,
  ),
  ),

diff --git a/lib/ui/app/upgrade_dialog.dart b/lib/ui/app/upgrade_dialog.dart
@@ -126,22 +126,25 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
  final List<Widget> stack = <Widget>[];
  if (_queryProductError == null) {
  stack.add(
- Scrollbar(
- thumbVisibility: true,
- controller: _scrollController,
- child: ListView(
+ Container(
+ width: double.maxFinite,
+ child: Scrollbar(
+  thumbVisibility: true,
  controller: _scrollController,
- children: <Widget>[
- if (Platform.isIOS)
- Padding(
- padding: const EdgeInsets.only(bottom: 16),
- child: Text(
- 'Payment will be charged to iTunes Account at confirmation of purchase. Subscription automatically renews unless auto-renew is turned off at least 24-hours before the end of the current period. Account will be charged for renewal within 24-hours prior to the end of the current period, and identify the cost of the renewal. Subscriptions may be managed by the user and auto-renewal may be turned off by going to the user\'s Account Settings after purchase.',
- style: TextStyle(fontSize: 12, color: Colors.grey),
+ child: ListView(
+ controller: _scrollController,
+ children: <Widget>[
+ if (Platform.isIOS)
+ Padding(
+ padding: const EdgeInsets.only(bottom: 16),
+ child: Text(
+ 'Payment will be charged to iTunes Account at confirmation of purchase. Subscription automatically renews unless auto-renew is turned off at least 24-hours before the end of the current period. Account will be charged for renewal within 24-hours prior to the end of the current period, and identify the cost of the renewal. Subscriptions may be managed by the user and auto-renewal may be turned off by going to the user\'s Account Settings after purchase.',
+ style: TextStyle(fontSize: 12, color: Colors.grey),
+ ),
  ),
- ),
- _buildProductList(),
- ],
+ _buildProductList(),
+ ],
+ ),
  ),
  ),
  );
@@ -292,7 +295,7 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
  final data = {
  'inapp_transaction_id': purchaseDetails.purchaseID,
  'key': state.account.key,
- 'plan': purchaseDetails.productID,
+ 'plan': purchaseDetails.productID.replaceAll('-', '_'),
  'plan_paid': (int.parse(purchaseDetails.transactionDate) / 1000).floor(),
  };
 

diff --git a/lib/utils/platforms.dart b/lib/utils/platforms.dart
@@ -37,7 +37,7 @@ bool supportsInAppPurchase() {
  return false;
  }
 
- return isIOS();
+ return isIOS() || isAndroid();
 }
 
 bool isDesktopOS() => isMacOS() || isWindows() || isLinux();