Merge branch 'develop'

2023-11-03 12:28:42 +02:00 · 2023-11-03 12:28:42 +02:00 · e3ba38674b
parent 883bffffad 5f5735f717
commit e3ba38674b
11 changed files with 167 additions and 44 deletions
--- 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
--- a/assets/images/com.invoiceninja.InvoiceNinja.svg
+++ b/assets/images/com.invoiceninja.InvoiceNinja.svg
@ -1,2 +1,156 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>Invoice Ninja icon</title><path d="M16.247 10.326a1.164 1.164 0 11-2.328 0 1.164 1.164 0 012.328 0zm-6.288 0a1.164 1.164 0 11-2.329 0 1.164 1.164 0 012.329 0zm-.14 13.52c-4.712-.98-8.227-4.257-9.482-8.842-.421-1.537-.421-4.49 0-6.027C1.506 4.709 4.73 1.485 8.997.316c1.538-.421 4.49-.421 6.028 0 4.267 1.169 7.492 4.393 8.66 8.66.24.874.294 1.43.294 3.014 0 1.584-.054 2.14-.293 3.014-1.17 4.271-4.439 7.536-8.661 8.65-1.391.367-3.916.46-5.206.192zm6.64-9.315c-3.047-1.348-4.054-1.737-4.5-1.737-.446 0-1.433.38-4.38 1.684-2.091.926-3.828 1.76-3.86 1.79h16.663zm-9.873-.361c1.621-.729 3.06-1.387 3.196-1.464.258-.145.337-.09-5.285-3.682-.56-.358-1.023-.698-1.025-.65V15.564a790.1 790.1 0 003.114-1.394zm14.078-2.194V8.417c0-.11-1.676.993-3.496 2.12-3 1.854-3.281 2.06-3.004 2.185 1.345.611 6.42 2.862 6.5 2.872zm-8.169.11c.545.125.643.104 1.226-.263.349-.22.655-.419.681-.442.026-.024-.05-.181-.167-.35-.118-.168-.215-.5-.215-.739V9.86l-.569.21c-.726.267-2.28.27-3 .005l-.556-.205.013.452c.007.26-.088.563-.225.715-.232.256-.22.276.45.726.64.432.725.455 1.23.327a2.349 2.349 0 011.132-.002zm-4.23-2.65c-.105-.113-2.97-.954-3.033-.891-.03.03.504.414 1.186.854l1.24.8.34-.344c.186-.188.307-.377.268-.42zm9.76-.373c.473-.306.8-.555.728-.555-.155 0-2.877.804-3.027.894-.057.034.033.229.2.433l.304.37.47-.293c.257-.162.854-.544 1.326-.85zm-1.636-.555c2.11-.59 3.867-1.102 3.904-1.139H3.59c.187.187 7.779 2.195 8.323 2.202.41.005 2.014-.376 4.476-1.063z"/></svg>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100%" viewBox="0 0 500 500" enable-background="new 0 0 500 500" xml:space="preserve">
+<path fill="#FEFEFE" opacity="1.000000" stroke="none" 
+	d="
+M293.000000,501.000000 
+	C195.333359,501.000000 98.166710,501.000000 1.000052,501.000000 
+	C1.000035,334.333405 1.000035,167.666794 1.000017,1.000142 
+	C167.666565,1.000094 334.333130,1.000094 500.999756,1.000047 
+	C500.999847,167.666519 500.999847,334.333038 500.999939,500.999786 
+	C431.833344,501.000000 362.666656,501.000000 293.000000,501.000000 
+M120.889961,38.368923 
+	C27.772596,95.770660 -16.657377,204.670990 9.204268,310.357758 
+	C44.202297,453.381500 197.916718,534.946350 336.035614,483.958099 
+	C455.064117,440.017303 521.832336,314.665802 491.947662,191.247025 
+	C465.796509,83.247223 367.755920,4.149209 257.635620,2.009252 
+	C208.793198,1.060102 163.403198,12.822569 120.889961,38.368923 
+z"/>
+<path fill="#312D2C" opacity="1.000000" stroke="none" 
+	d="
+M121.198471,38.175827 
+	C163.403198,12.822569 208.793198,1.060102 257.635620,2.009252 
+	C367.755920,4.149209 465.796509,83.247223 491.947662,191.247025 
+	C521.832336,314.665802 455.064117,440.017303 336.035614,483.958099 
+	C197.916718,534.946350 44.202297,453.381500 9.204268,310.357758 
+	C-16.657377,204.670990 27.772596,95.770660 121.198471,38.175827 
+M280.500000,345.069489 
+	C326.812164,345.069489 373.124329,345.069489 419.436523,345.069489 
+	C418.608704,343.354858 417.685669,342.723999 416.680115,342.280090 
+	C366.484192,320.120636 316.319122,297.890503 266.046906,275.905365 
+	C256.017426,271.519257 245.532089,271.809021 235.479233,276.224243 
+	C190.257431,296.085663 145.089661,316.070129 99.905685,336.017670 
+	C94.206360,338.533783 88.526695,341.094391 82.837921,343.634399 
+	C82.914940,344.112762 82.991959,344.591125 83.068977,345.069489 
+	C148.545990,345.069489 214.022995,345.069489 280.500000,345.069489 
+M357.450439,227.942398 
+	C334.923889,241.929520 312.397308,255.916641 289.272980,270.274933 
+	C336.346375,290.683228 382.479553,310.683899 428.940918,330.826843 
+	C428.940918,281.423615 428.940918,232.897400 428.940918,183.708954 
+	C404.986328,198.540451 381.533386,213.061340 357.450439,227.942398 
+M156.296814,295.784851 
+	C174.976227,287.381775 193.655640,278.978699 213.139465,270.213715 
+	C167.527588,241.062759 122.779572,212.463898 77.711121,183.660233 
+	C77.711121,233.173996 77.711121,281.712433 77.711121,330.862427 
+	C104.008179,319.100952 129.795578,307.567413 156.296814,295.784851 
+M130.495590,178.990967 
+	C164.615097,188.468109 198.764755,197.838669 232.838043,207.479172 
+	C245.043793,210.932602 257.024994,211.003647 269.221771,207.590439 
+	C315.479950,194.645340 361.778351,181.844009 408.055389,168.966141 
+	C412.655396,167.686066 417.212219,166.250687 421.789062,164.887390 
+	C421.715546,164.719574 421.642059,164.551758 421.568542,164.383942 
+	C307.888000,164.383942 194.207458,164.383942 80.526924,164.383942 
+	C80.490875,164.575043 80.454826,164.766159 80.418777,164.957260 
+	C96.843842,169.585312 113.268906,174.213364 130.495590,178.990967 
+M294.379913,216.699432 
+	C293.539612,216.485001 292.602844,215.916779 291.875153,216.115250 
+	C288.030487,217.163849 284.223663,218.359848 280.430878,219.588562 
+	C267.446686,223.794861 254.178421,226.255234 240.607224,223.824509 
+	C231.807968,222.248474 223.227249,219.459824 214.538086,217.256027 
+	C212.467453,216.730865 210.354721,216.371689 209.609665,216.216690 
+	C209.609665,221.673141 210.789734,227.069122 209.283981,231.565704 
+	C207.719604,236.237350 203.557846,240.039246 200.320694,244.513443 
+	C208.752121,249.908920 217.803131,255.804077 227.002930,261.457092 
+	C228.149857,262.161865 230.200409,261.970398 231.636536,261.540436 
+	C244.601410,257.658936 257.524078,257.694702 270.505890,261.436401 
+	C271.976837,261.860352 274.038483,262.238495 275.161163,261.551331 
+	C284.495972,255.837601 293.674500,249.868515 303.045715,243.883667 
+	C291.868561,234.969208 289.662018,228.206848 294.379913,216.699432 
+M177.280365,208.555115 
+	C177.902069,208.164093 178.523773,207.773071 179.979935,206.857208 
+	C156.636780,199.870239 134.163971,193.143768 111.691170,186.417313 
+	C111.551102,186.822647 111.411034,187.227982 111.270966,187.633301 
+	C129.582474,199.323746 147.893967,211.014175 166.508942,222.898346 
+	C168.164505,216.258133 171.524155,211.930588 177.280365,208.555115 
+M345.403839,199.943619 
+	C338.002808,202.194214 330.601776,204.444794 324.108032,206.419495 
+	C328.504852,211.577484 332.856567,216.682495 337.388275,221.998703 
+	C354.714813,210.906906 372.790955,199.335220 390.867126,187.763535 
+	C390.675537,187.339111 390.483978,186.914703 390.292419,186.490295 
+	C375.592743,190.925354 360.893066,195.360428 345.403839,199.943619 
+z"/>
+<path fill="#FEFEFE" opacity="1.000000" stroke="none" 
+	d="
+M280.000000,345.069489 
+	C214.022995,345.069489 148.545990,345.069489 83.068977,345.069489 
+	C82.991959,344.591125 82.914940,344.112762 82.837921,343.634399 
+	C88.526695,341.094391 94.206360,338.533783 99.905685,336.017670 
+	C145.089661,316.070129 190.257431,296.085663 235.479233,276.224243 
+	C245.532089,271.809021 256.017426,271.519257 266.046906,275.905365 
+	C316.319122,297.890503 366.484192,320.120636 416.680115,342.280090 
+	C417.685669,342.723999 418.608704,343.354858 419.436523,345.069489 
+	C373.124329,345.069489 326.812164,345.069489 280.000000,345.069489 
+z"/>
+<path fill="#FEFEFE" opacity="1.000000" stroke="none" 
+	d="
+M357.765442,227.762329 
+	C381.533386,213.061340 404.986328,198.540451 428.940918,183.708954 
+	C428.940918,232.897400 428.940918,281.423615 428.940918,330.826843 
+	C382.479553,310.683899 336.346375,290.683228 289.272980,270.274933 
+	C312.397308,255.916641 334.923889,241.929520 357.765442,227.762329 
+z"/>
+<path fill="#FDFDFC" opacity="1.000000" stroke="none" 
+	d="
+M155.939880,295.909363 
+	C129.795578,307.567413 104.008179,319.100952 77.711121,330.862427 
+	C77.711121,281.712433 77.711121,233.173996 77.711121,183.660233 
+	C122.779572,212.463898 167.527588,241.062759 213.139465,270.213715 
+	C193.655640,278.978699 174.976227,287.381775 155.939880,295.909363 
+z"/>
+<path fill="#FBFBFB" opacity="1.000000" stroke="none" 
+	d="
+M130.094788,178.916199 
+	C113.268906,174.213364 96.843842,169.585312 80.418777,164.957260 
+	C80.454826,164.766159 80.490875,164.575043 80.526924,164.383942 
+	C194.207458,164.383942 307.888000,164.383942 421.568542,164.383942 
+	C421.642059,164.551758 421.715546,164.719574 421.789062,164.887390 
+	C417.212219,166.250687 412.655396,167.686066 408.055389,168.966141 
+	C361.778351,181.844009 315.479950,194.645340 269.221771,207.590439 
+	C257.024994,211.003647 245.043793,210.932602 232.838043,207.479172 
+	C198.764755,197.838669 164.615097,188.468109 130.094788,178.916199 
+z"/>
+<path fill="#FDFCFC" opacity="1.000000" stroke="none" 
+	d="
+M294.215454,217.000336 
+	C289.662018,228.206848 291.868561,234.969208 303.045715,243.883667 
+	C293.674500,249.868515 284.495972,255.837601 275.161163,261.551331 
+	C274.038483,262.238495 271.976837,261.860352 270.505890,261.436401 
+	C257.524078,257.694702 244.601410,257.658936 231.636536,261.540436 
+	C230.200409,261.970398 228.149857,262.161865 227.002930,261.457092 
+	C217.803131,255.804077 208.752121,249.908920 200.320694,244.513443 
+	C203.557846,240.039246 207.719604,236.237350 209.283981,231.565704 
+	C210.789734,227.069122 209.609665,221.673141 209.609665,216.216690 
+	C210.354721,216.371689 212.467453,216.730865 214.538086,217.256027 
+	C223.227249,219.459824 231.807968,222.248474 240.607224,223.824509 
+	C254.178421,226.255234 267.446686,223.794861 280.430878,219.588562 
+	C284.223663,218.359848 288.030487,217.163849 291.875153,216.115250 
+	C292.602844,215.916779 293.539612,216.485001 294.215454,217.000336 
+z"/>
+<path fill="#F8F8F8" opacity="1.000000" stroke="none" 
+	d="
+M176.967468,208.758667 
+	C171.524155,211.930588 168.164505,216.258133 166.508942,222.898346 
+	C147.893967,211.014175 129.582474,199.323746 111.270966,187.633301 
+	C111.411034,187.227982 111.551102,186.822647 111.691170,186.417313 
+	C134.163971,193.143768 156.636780,199.870239 179.979935,206.857208 
+	C178.523773,207.773071 177.902069,208.164093 176.967468,208.758667 
+z"/>
+<path fill="#F8F7F7" opacity="1.000000" stroke="none" 
+	d="
+M345.798615,199.869568 
+	C360.893066,195.360428 375.592743,190.925354 390.292419,186.490295 
+	C390.483978,186.914703 390.675537,187.339111 390.867126,187.763535 
+	C372.790955,199.335220 354.714813,210.906906 337.388275,221.998703 
+	C332.856567,216.682495 328.504852,211.577484 324.108032,206.419495 
+	C330.601776,204.444794 338.002808,202.194214 345.798615,199.869568 
+z"/>
+</svg>
--- a/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml
+++ b/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml
@ -47,6 +47,7 @@
  </screenshots>
  <content_rating type="oars-1.1"/>
  <releases>
+    <release version="5.0.138" date="2023-11-03"/>
    <release version="5.0.137" date="2023-11-02"/>
    <release version="5.0.136" date="2023-11-01"/>
  </releases>
--- 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';
--- 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);
  }

--- a/lib/ui/client/client_pdf.dart
+++ b/lib/ui/client/client_pdf.dart
@ -171,19 +171,6 @@ class _ClientPdfViewState extends State<ClientPdfView> {
      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;
  }

--- a/lib/ui/invoice/invoice_pdf.dart
+++ b/lib/ui/invoice/invoice_pdf.dart
@ -351,18 +351,5 @@ Future<Response?> _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;
 }
--- 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);
--- 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
--- 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
--- 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