Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c938e981 authored by Frank's avatar Frank
Browse files

Modification of DeviceManager code to take account of changes in Adb and... 

Modification of DeviceManager code to take account of changes in Adb and adbDaemonWebUsbDevice object properties. In short, the information (product, model, device(codename)) is obtained from the Adb class. And the name from adbDaemonWebUsbDevice.
parent 41bb8683

app/src/controller.manager.js

+14 −15
Original line number Diff line number Diff line
@@ -314,10 +314,9 @@ export class Controller { 
        WDebug.log("Security patch Error");

        current_security_path_level = null;

      }



      let this_model = this.deviceManager.adb.webusb.device;

      let this_model = this.deviceManager.adb.webusb.transport.banner.device;

      //    https://gitlab.e.foundation/e/os/backlog/-/issues/2604#note_609234

      const model = this.deviceManager.adb.webusb.model;

      const model = this.deviceManager.adb.webusb.transport.banner.model;

      if (model.includes("Teracube") && model.includes("2e")) {

        try {

          const serial = await this.deviceManager.adb.getSerialNumber();
@@ -329,31 +328,31 @@ export class Controller { 
          } else {

            const id =

              "model " +

              this.deviceManager.adb.webusb.model +

              this.deviceManager.adb.webusb.transport.banner.model +

              " " +

              "product " +

              this.deviceManager.adb.webusb.product +

              this.deviceManager.adb.webusb.transport.banner.product +

              " " +

              "name " +

              this.deviceManager.adb.webusb.name +

              this.deviceManager.adb.device.name +

              " " +

              "device " +

              this.deviceManager.adb.webusb.device;

              this.deviceManager.adb.webusb.transport.banner.device;

            throw new Error("Cannot find device resource", id);

          }

        } catch {

          const id =

            "model " +

            this.deviceManager.adb.webusb.model +

            this.deviceManager.adb.webusb.transport.banner.model +

            " " +

            "product " +

            this.deviceManager.adb.webusb.product +

            this.deviceManager.adb.webusb.transport.banner.product +

            " " +

            "name " +

            this.deviceManager.adb.webusb.name +

            this.deviceManager.adb.device.name +

            " " +

            "device " +

            this.deviceManager.adb.webusb.device;

            this.deviceManager.adb.webusb.transport.banner.device;

          throw new Error("Error on getting device resource", id);

        }

      }
@@ -364,16 +363,16 @@ export class Controller { 
        } catch {

          const id =

            "model " +

            this.deviceManager.adb.webusb.model +

            this.deviceManager.adb.webusb.transport.banner.model +

            " " +

            "product " +

            this.deviceManager.adb.webusb.product +

            this.deviceManager.adb.webusb.transport.banner.product +

            " " +

            "name " +

            this.deviceManager.adb.webusb.name +

            this.deviceManager.adb.device.name +

            " " +

            "device " +

            this.deviceManager.adb.webusb.device;

            this.deviceManager.adb.webusb.transport.banner.device;

          throw new Error("Error on getting devcice resource", id);

        }

      }

app/src/controller/device/adb.class.js

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ export class ADB extends Device { 
  }



  getProductName() {

    return this.webusb.name;

    return this.device.name;

  }



  async getAndroidVersion() {