Merge dev to master (#28)

* Pls work
zbejas · Nov 4, 2022 · 4896eaf · 4896eaf
1 parent 369af44
commit 4896eaf
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,6 @@
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/zbejas/portarius?label=Release)](https://github.com/zbejas/portarius/releases/latest)
 [![Release date](https://img.shields.io/github/release-date/zbejas/portarius?labely)](https://github.com/zbejas/portarius/releases/)
 ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/zbejas/portarius?color=yellow&include_prereleases&label=dev-release)
-[![GitHub](https://img.shields.io/github/license/zbejas/portarius)](https://github.com/zbejas/portarius/blob/master/LICENSE)
 
 ## Features
 
@@ -20,6 +19,17 @@
 - Biometric authentication
 - Data is stored with AES256 encryption
 
+## Documentation
+
+- [FAQ](https://github.com/zbejas/portarius/wiki/FAQ) 
+- [Privacy policy](https://github.com/zbejas/portarius/wiki/Privacy-Policy)
+
+## Install
+
+| Google Play | IzzyOnDroid | GitHub |
+| :--: | :--: | :--: |
+| [<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=si.zbe.portarius) | [<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="80">](https://apt.izzysoft.de/fdroid/index/apk/si.zbe.portarius) | [<img src="https://censorship.no/img/github-badge.png" alt="Get it on Github" height="80">](https://github.com/zbejas/portarius/releases) |
+
 ## Screenshots
 
 | Drawer | Home | Auth | Settings |
@@ -35,24 +45,13 @@
 
 </details>
 
-## Install
-
-| Google Play | IzzyOnDroid | GitHub |
-| :--: | :--: | :--: |
-| [<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=si.zbe.portarius) | [<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="80">](https://apt.izzysoft.de/fdroid/index/apk/si.zbe.portarius) | [<img src="https://censorship.no/img/github-badge.png" alt="Get it on Github" height="80">](https://github.com/zbejas/portarius/releases) |
-
 ## Contribute
 
 - [Report](https://github.com/zbejas/portarius/issues/new?assignees=&labels=&template=bug_report.md&title=) a bug
 - [Request](https://github.com/zbejas/portarius/issues/new?assignees=&labels=&template=feature_request.md&title=) a feature
 - [Help](https://github.com/zbejas/portarius/issues) with the issues
 - [Send](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests) a pull request
 
-## Documentation
-
-- [FAQ](https://github.com/zbejas/portarius/wiki/FAQ) 
-- [Privacy policy](https://github.com/zbejas/portarius/wiki/Privacy-Policy)
-
 ## Donations
 
 | Paypal | LiberaPay | Buy Me a Coffee |

diff --git a/lib/components/drawer/drawer.dart b/lib/components/drawer/drawer.dart
@@ -134,12 +134,16 @@ class _PortariusDrawerState extends State<PortariusDrawer> {
                           future: RemoteService().getEndpoints(user),
                           builder: (context, snapshot) {
                             if (snapshot.hasData) {
-                              Endpoint? pickedEndpoint =
-                                  snapshot.data!.firstWhere(
-                                (endpoint) =>
-                                    endpoint.id == settings.selectedEndpointId,
-                              );
-
+                              Endpoint? pickedEndpoint;
+                              try {
+                                pickedEndpoint = snapshot.data!.firstWhere(
+                                  (endpoint) =>
+                                      endpoint.id ==
+                                      settings.selectedEndpointId,
+                                );
+                              } catch (e) {
+                                pickedEndpoint = snapshot.data!.first;
+                              }
                               if (snapshot.data!.isEmpty) {
                                 return const Text('No endpoints');
                               } else if (snapshot.data!.length == 1) {

diff --git a/lib/models/portainer/endpoint.dart b/lib/models/portainer/endpoint.dart
@@ -462,8 +462,8 @@ class EndpointSnapshot {
 
   factory EndpointSnapshot.fromJson(Map<String, dynamic> json) =>
       EndpointSnapshot(
-        dockerSnapshotRaw:
-            DockerSnapshotRaw.fromJson(json["DockerSnapshotRaw"]),
+        /*dockerSnapshotRaw:
+            DockerSnapshotRaw.fromJson(json["DockerSnapshotRaw"]),*/
         dockerVersion: json["DockerVersion"],
         healthyContainerCount: json["HealthyContainerCount"],
         imageCount: json["ImageCount"],

diff --git a/pubspec.lock b/pubspec.lock
@@ -98,7 +98,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   charcode:
     dependency: transitive
     description:
@@ -416,14 +416,14 @@ packages:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   mime:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,8 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 1.1.0+8
-
+version: 1.1.1+9
 
 environment:
     sdk: ">=2.17.1 <3.0.0"