diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index e3c3a39..9aeeaf1 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -623,6 +623,7 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u task.show_total = showTotal; task.app_name = name || ''; task.status = name + showTotal + 'Installing Apk... '; + console.log('Installing filePath', filePath, 'Name', name); return this.adbCommand('install', { serial: this.deviceSerial, path: filePath, isLocal: !!isLocal }, status => { if (status.percent && status.size && status.time) { task.status = diff --git a/desktop-app/src/app/header-banner/header-banner.component.ts b/desktop-app/src/app/header-banner/header-banner.component.ts index 7c3563c..1f955f4 100644 --- a/desktop-app/src/app/header-banner/header-banner.component.ts +++ b/desktop-app/src/app/header-banner/header-banner.component.ts @@ -36,7 +36,7 @@ export class HeaderBannerComponent implements OnInit { } setOutOfDate() { - // any time we don't know the currently installed app version or we don't know the latest available version, treat it as up to date + // any time we don't know the currently installed app version, or we don't know the latest available version, treat it as up to date if (this.latestAppVersion !== null && this.adb.appVersionCode !== null && this.adb.appVersionCode !== undefined) { if (Number(this.adb.appVersionCode) < Number(this.latestAppVersion)) { this.isOutOfDate = true; @@ -47,6 +47,10 @@ export class HeaderBannerComponent implements OnInit { } async getLatestApk() { + this.latestAppVersion = '28'; + this.setOutOfDate(); + return; + const { apk, version } = await this.getExperimentalAPK(); if (apk.length) { this.latestAppVersion = version; @@ -119,6 +123,7 @@ export class HeaderBannerComponent implements OnInit { // this.telemetry.telemetry({ event: 'install-sidequest-apk', installType: telemEvent, oldVersion }); this.isLoading = true; try { + throw new Error('bypass_experimental'); await this.getLatestApk(); await this.downloadExperimentalAPK(); } catch (e) { diff --git a/package.json b/package.json index 2c288ec..08c19e8 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,8 @@ "start:local": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .\" \"cd desktop-app && ng serve -c local --port 4205\"", "postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install", "dist": "yarn electron-build && yarn platform-tools && yarn app-build && env-cmd --silent electron-builder --publish onTagOrDraft", + "build:win": "yarn electron-build && yarn platform-tools && yarn app-build && cross-env NODE_ENV=production electron-builder --win", + "build:linux": "yarn electron-build && yarn platform-tools && yarn app-build && cross-env NODE_ENV=production electron-builder --linux", "dist-test": "yarn electron-build && yarn platform-tools && yarn app-build-test && cross-env SQ_ENV_CFG=test electron-builder", "angular": "cd desktop-app && ng serve --port 4205", "angular:test": "cd desktop-app && ng serve -c test --port 4205",