Mirrors/responsively-app
2
0
Fork 0
mirror of https://github.com/responsively-org/responsively-app synced 2024-11-14 00:17:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

move permission preferences default value to migration code

Browse source
This commit is contained in:
jjavierdguezas 2020-08-27 16:38:19 +02:00
parent ce85de27ed
commit 4fd0f1d51a
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
desktop-app/app/reducers/browser.js
View file

@ -1,8 +1,6 @@
// @flow
import {ipcRenderer, remote} from 'electron';
import settings from 'electron-settings';
import {isIfStatement} from 'typescript';
import trimStart from 'lodash/trimStart';
import {
NEW_ADDRESS,
NEW_ZOOM_LEVEL,
@ -16,7 +14,6 @@ import {
NEW_HOMEPAGE,
NEW_USER_PREFERENCES,
DELETE_CUSTOM_DEVICE,
TOGGLE_BOOKMARK,
NEW_DEV_TOOLS_CONFIG,
NEW_INSPECTOR_STATUS,
NEW_WINDOW_SIZE,
@ -52,7 +49,6 @@ import {
saveLastOpenedAddress,
} from '../utils/navigatorUtils';
import {updateExistingUrl} from '../services/searchUrlSuggestions';
import {PERMISSION_MANAGEMENT_OPTIONS} from '../constants/permissionsManagement';
export const FILTER_FIELDS = {
OS: 'OS',
@ -197,17 +193,9 @@ function _getActiveDevices() {
}
function _getUserPreferences(): UserPreferenceType {
const fromSettings = settings.get(USER_PREFERENCES);
if (fromSettings == null)
return {
removeFixedPositionedElements: true,
permissionManagement: PERMISSION_MANAGEMENT_OPTIONS.ALLOW_ALWAYS,
};
if (fromSettings.permissionManagement == null)
fromSettings.permissionManagement = PERMISSION_MANAGEMENT_OPTIONS.ALLOW_ALWAYS;
return fromSettings;
return (
settings.get(USER_PREFERENCES) || {removeFixedPositionedElements: true}
);
}
function _setUserPreferences(userPreferences) {

14
desktop-app/app/settings/migration.js
View file

@ -1,5 +1,6 @@
import settings from 'electron-settings';
import {ACTIVE_DEVICES, USER_PREFERENCES} from '../constants/settingKeys';
import {PERMISSION_MANAGEMENT_OPTIONS} from '../constants/permissionsManagement';
export function migrateDeviceSchema() {
if (settings.get('USER_PREFERENCES')) {
@ -9,6 +10,7 @@ export function migrateDeviceSchema() {
_handleScreenshotPreferences();
_handleDeviceSchema();
_handlePermissionsDefaultPreferences();
}
const _handleDeviceSchema = () => {
@ -33,4 +35,16 @@ const _handleScreenshotPreferences = () => {
settings.set(USER_PREFERENCES, userPreferences);
};
const _handlePermissionsDefaultPreferences = () => {
const userPreferences = settings.get(USER_PREFERENCES) || {};
if (userPreferences.permissionManagement != null) {
return;
}
userPreferences.permissionManagement =
PERMISSION_MANAGEMENT_OPTIONS.ALLOW_ALWAYS;
settings.set(USER_PREFERENCES, userPreferences);
};
export default {migrateDeviceSchema};