gracefully handle qr scan errors, improve help texts

nabto · Aug 28, 2019 · 41fa481 · 41fa481
1 parent d0be4a1
commit 41fa481
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/app/nabto.service.ts b/src/app/nabto.service.ts
@@ -314,7 +314,7 @@ export class NabtoService {
     }
   }
 
-  private getPublicDetails(deviceId: string): Promise<NabtoDevice> {
+  public getPublicDetails(deviceId: string): Promise<NabtoDevice> {
     return new Promise((resolve, reject) => {
       this.invokeRpc(deviceId, "get_public_device_info.json")
         .then((details:any) => {

diff --git a/src/pages/acl-add/acl-add.ts b/src/pages/acl-add/acl-add.ts
@@ -106,7 +106,7 @@ export class AclAddPage {
         this.name = json.n;
         this.fingerprint = json.f;
       }
-    });
+    }).catch((error) => this.showToast(error));
   }
 
   clear() {

diff --git a/src/pages/device-add/device-add.ts b/src/pages/device-add/device-add.ts
@@ -84,7 +84,7 @@ export class DeviceAddPage {
       if (json != null) {
         this.deviceId = json.i;
       }
-    });
+    }).catch((error) => this.showToast(error));
   }
 
   clear() {

diff --git a/src/pages/overview/overview.html b/src/pages/overview/overview.html
@@ -23,7 +23,7 @@
       No known devices
     </ion-card-header>
     <ion-card-content>
-      Add a device by clicking the button below to scan the local network for available devices.
+      Add a device using the buttons below: Either scan the local network for available devices or manually enter a device id.
       </ion-card-content>
   </ion-card>