diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 21e56c937..a37bbf50a 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -86,7 +86,7 @@ jobs: draft: false prerelease: false title: "Latest Release" - automatic_release_tag: "v5.0.137" + automatic_release_tag: "v5.0.138" files: | ${{ github.workspace }}/artifacts/Invoice-Ninja-Archive ${{ github.workspace }}/artifacts/Invoice-Ninja-Hash diff --git a/assets/images/com.invoiceninja.InvoiceNinja.svg b/assets/images/com.invoiceninja.InvoiceNinja.svg index 8e838c8f8..8b8b1da8b 100644 --- a/assets/images/com.invoiceninja.InvoiceNinja.svg +++ b/assets/images/com.invoiceninja.InvoiceNinja.svg @@ -1,2 +1,156 @@ - -Invoice Ninja icon \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml b/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml index eab6fcb51..c662fe055 100644 --- a/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml +++ b/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml @@ -47,6 +47,7 @@ + diff --git a/lib/constants.dart b/lib/constants.dart index 3ed5ce9c8..f9c90a28a 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -4,7 +4,7 @@ class Constants { } // TODO remove version once #46609 is fixed -const String kClientVersion = '5.0.137'; +const String kClientVersion = '5.0.138'; const String kMinServerVersion = '5.0.4'; const String kAppName = 'Invoice Ninja'; diff --git a/lib/data/web_client.dart b/lib/data/web_client.dart index 67f728483..56a6f2e8b 100644 --- a/lib/data/web_client.dart +++ b/lib/data/web_client.dart @@ -51,12 +51,12 @@ class WebClient { ); client.close(); + _checkResponse(url, response); + if (rawResponse) { return response; } - _checkResponse(url, response); - final dynamic jsonResponse = json.decode(response.body); //debugPrint(response.body, wrapWidth: 1000); @@ -113,12 +113,12 @@ class WebClient { client.close(); } + _checkResponse(url, response); + if (rawResponse) { return response; } - _checkResponse(url, response); - return json.decode(response.body); } diff --git a/lib/ui/client/client_pdf.dart b/lib/ui/client/client_pdf.dart index 01971eda9..6f1e5c365 100644 --- a/lib/ui/client/client_pdf.dart +++ b/lib/ui/client/client_pdf.dart @@ -171,19 +171,6 @@ class _ClientPdfViewState extends State { rawResponse: true, ); - if (response!.statusCode >= 400) { - String errorMessage = - '${response.statusCode}: ${response.reasonPhrase}\n\n'; - - try { - errorMessage += jsonDecode(response.body)['message']; - } catch (error) { - errorMessage += response.body; - } - - throw errorMessage; - } - return response; } diff --git a/lib/ui/invoice/invoice_pdf.dart b/lib/ui/invoice/invoice_pdf.dart index 19b30188f..ff0b15d3f 100644 --- a/lib/ui/invoice/invoice_pdf.dart +++ b/lib/ui/invoice/invoice_pdf.dart @@ -351,18 +351,5 @@ Future _loadPDF( response = await WebClient().get(url, '', rawResponse: true); } - if (response!.statusCode >= 400) { - String errorMessage = - '${response.statusCode}: ${response.reasonPhrase}\n\n'; - - try { - errorMessage += jsonDecode(response.body)['message']; - } catch (error) { - errorMessage += response.body; - } - - throw errorMessage; - } - return response; } diff --git a/lib/utils/designs.dart b/lib/utils/designs.dart index d1b81d6c0..e3a51c9b9 100644 --- a/lib/utils/designs.dart +++ b/lib/utils/designs.dart @@ -48,13 +48,7 @@ void loadDesign({ webClient .post(url, credentials.token, data: json.encode(data), rawResponse: true) .then((dynamic response) { - if ((response as Response).statusCode >= 400) { - showErrorDialog( - message: '${response.statusCode}: ${response.reasonPhrase}'); - onComplete(null); - } else { - onComplete(response); - } + onComplete(response); }).catchError((dynamic error) { showErrorDialog(message: '$error'); onComplete(null); diff --git a/pubspec.foss.yaml b/pubspec.foss.yaml index 269a1c85b..d325990aa 100644 --- a/pubspec.foss.yaml +++ b/pubspec.foss.yaml @@ -1,6 +1,6 @@ name: invoiceninja_flutter description: Client for Invoice Ninja -version: 5.0.137+137 +version: 5.0.138+138 homepage: https://invoiceninja.com documentation: https://invoiceninja.github.io publish_to: none diff --git a/pubspec.yaml b/pubspec.yaml index 1b7b03952..f5ccc9cfd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: invoiceninja_flutter description: Client for Invoice Ninja -version: 5.0.137+137 +version: 5.0.138+138 homepage: https://invoiceninja.com documentation: https://invoiceninja.github.io publish_to: none diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a71a4f4b0..20b771b1b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: invoiceninja -version: '5.0.137' +version: '5.0.138' summary: Create invoices, accept payments, track expenses & time tasks description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead