Skip to content

Commit ea02573

Browse files
authored
Merge pull request #4 from jwlilly/2.0.2
Fixing corrupt dll and apk issues
2 parents b488231 + bb4878a commit ea02573

File tree

8 files changed

+11
-67
lines changed

8 files changed

+11
-67
lines changed

assets/adb/AdbWinApi.dll

41 Bytes
Binary file not shown.

assets/adb/AdbWinUsbApi.dll

41 Bytes
Binary file not shown.

assets/adb/app-debug.apk

-1.74 MB
Binary file not shown.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"hot",
1313
"reload"
1414
],
15-
"version": "2.0.0",
15+
"version": "2.0.2",
1616
"homepage": "https://github.com/jwlilly/Android-Accessibility-Inspector-Ap/#readme",
1717
"bugs": {
1818
"url": "https://github.com/jwlilly/Android-Accessibility-Inspector-App/issues"
@@ -37,6 +37,7 @@
3737
"lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
3838
"lint:fix": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx --fix",
3939
"package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never && npm run build:dll",
40+
"publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish=onTagOrDraft && npm run build:dll",
4041
"rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
4142
"prestart": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.dev.ts",
4243
"start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run prestart && npm run start:renderer",

release/app/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "android-accessibility-inspector",
3-
"version": "2.0.0",
3+
"version": "2.0.2",
44
"description": "View and analyze the accessibility tree for Android apps",
55
"license": "GPL-3.0-only",
66
"author": {

src/main/main.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,11 @@ const createWindow = async () => {
294294

295295
ADB_PATH = path.join(getAssetPath(), 'adb');
296296
adb = new Client({ bin: path.join(ADB_PATH, ADB_BIN) });
297+
adb
298+
.startServer()
299+
.then(() => log.info('adb server started'))
300+
.catch((error) => log.error(error));
301+
log.info(adb);
297302

298303
mainWindow = new BrowserWindow({
299304
show: false,

src/main/menu.ts

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -206,45 +206,14 @@ export default class MenuBuilder {
206206
{ label: 'Bring All to Front', selector: 'arrangeInFront:' },
207207
],
208208
};
209-
const subMenuHelp: MenuItemConstructorOptions = {
210-
label: 'Help',
211-
submenu: [
212-
{
213-
label: 'Learn More',
214-
click() {
215-
shell.openExternal('https://electronjs.org');
216-
},
217-
},
218-
{
219-
label: 'Documentation',
220-
click() {
221-
shell.openExternal(
222-
'https://github.com/electron/electron/tree/main/docs#readme',
223-
);
224-
},
225-
},
226-
{
227-
label: 'Community Discussions',
228-
click() {
229-
shell.openExternal('https://www.electronjs.org/community');
230-
},
231-
},
232-
{
233-
label: 'Search Issues',
234-
click() {
235-
shell.openExternal('https://github.com/electron/electron/issues');
236-
},
237-
},
238-
],
239-
};
240209

241210
const subMenuView =
242211
process.env.NODE_ENV === 'development' ||
243212
process.env.DEBUG_PROD === 'true'
244213
? subMenuViewDev
245214
: subMenuViewProd;
246215

247-
return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow, subMenuHelp];
216+
return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow];
248217
}
249218

250219
buildDefaultTemplate() {
@@ -313,37 +282,6 @@ export default class MenuBuilder {
313282
},
314283
],
315284
},
316-
{
317-
label: 'Help',
318-
submenu: [
319-
{
320-
label: 'Learn More',
321-
click() {
322-
shell.openExternal('https://electronjs.org');
323-
},
324-
},
325-
{
326-
label: 'Documentation',
327-
click() {
328-
shell.openExternal(
329-
'https://github.com/electron/electron/tree/main/docs#readme',
330-
);
331-
},
332-
},
333-
{
334-
label: 'Community Discussions',
335-
click() {
336-
shell.openExternal('https://www.electronjs.org/community');
337-
},
338-
},
339-
{
340-
label: 'Search Issues',
341-
click() {
342-
shell.openExternal('https://github.com/electron/electron/issues');
343-
},
344-
},
345-
],
346-
},
347285
];
348286

349287
return templateDefault;

0 commit comments

Comments
 (0)