phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-60080] Fixed the MAS migration from the DMG build, fixed a potential crash case (#3186)

Browse Source 
* [MM-60080] Fixed the MAS migration from the DMG build, fixed a potential crash case

* Merge'd
This commit is contained in:
Devin Binnie
2024-11-04 10:54:46 -05:00
committed by GitHub
parent ebbee6da5d
commit 03dcd86a5a
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/app/utils.test.js
View File

@@ -241,7 +241,7 @@ describe('main/app/utils', () => {
dialog.showMessageBoxSync.mockReturnValue(0); dialog.showMessageBoxSync.mockReturnValue(0);
dialog.showOpenDialogSync.mockReturnValue(['/old/data/path']); dialog.showOpenDialogSync.mockReturnValue(['/old/data/path']);
migrateMacAppStore(); migrateMacAppStore();
expect(fs.cpSync).toHaveBeenCalledWith('/old/data/path', '/path/to/data'); expect(fs.cpSync).toHaveBeenCalledWith('/old/data/path', '/path/to/data', {recursive: true});
expect(updatePaths).toHaveBeenCalled(); expect(updatePaths).toHaveBeenCalled();
expect(migrationPrefs.setValue).toHaveBeenCalledWith('masConfigs', true); expect(migrationPrefs.setValue).toHaveBeenCalledWith('masConfigs', true);
}); });

2
src/main/app/utils.ts
View File

@@ -232,7 +232,7 @@ export function migrateMacAppStore() {
} }
try { try {
fs.cpSync(result[0], app.getPath('userData')); fs.cpSync(result[0], app.getPath('userData'), {recursive: true});
updatePaths(true); updatePaths(true);
migrationPrefs.setValue('masConfigs', true); migrationPrefs.setValue('masConfigs', true);
} catch (e) { } catch (e) {

1
src/main/developerMode.ts
View File

@@ -62,6 +62,7 @@ export class DeveloperMode extends EventEmitter {
let developerMode = new DeveloperMode(developerModeJson); let developerMode = new DeveloperMode(developerModeJson);
ipcMain.on(UPDATE_PATHS, () => { ipcMain.on(UPDATE_PATHS, () => {
ipcMain.removeHandler(IS_DEVELOPER_MODE_ENABLED);
developerMode = new DeveloperMode(developerModeJson); developerMode = new DeveloperMode(developerModeJson);
}); });
export default developerMode; export default developerMode;

3
src/main/permissionsManager.ts
View File

@@ -251,6 +251,9 @@ t('main.permissionsManager.checkPermission.dialog.detail.screenShare');
let permissionsManager = new PermissionsManager(permissionsJson); let permissionsManager = new PermissionsManager(permissionsJson);
ipcMain.on(UPDATE_PATHS, () => { ipcMain.on(UPDATE_PATHS, () => {
ipcMain.removeAllListeners(OPEN_WINDOWS_CAMERA_PREFERENCES);
ipcMain.removeAllListeners(OPEN_WINDOWS_MICROPHONE_PREFERENCES);
ipcMain.removeHandler(GET_MEDIA_ACCESS_STATUS);
permissionsManager = new PermissionsManager(permissionsJson); permissionsManager = new PermissionsManager(permissionsJson);
}); });