Skip to content

Commit

Permalink
disable "local store" feature toggle and bump 2.0.0-beta.7
Browse files Browse the repository at this point in the history
  • Loading branch information
vladimiry committed Nov 23, 2018
1 parent d5a7fa6 commit 8b423e7
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 14 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
branches:
only:
- master
- 2.0.0
language: node_js
node_js: 10
addons:
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
branches:
only:
- master
- 2.0.0
skip_tags: true
os: unstable
platform:
Expand Down
1 change: 1 addition & 0 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ artifactName: ${name}-${version}-${os}-${arch}.${ext}

publish: {provider: github, releaseType: draft, vPrefixedTagName: true}
forceCodeSigning: false
generateUpdatesFilesForAllChannels: true

# TODO consider moving fully bundable "dependencies" to "devDependencies" to reduce final package size

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "email-securely-app",
"description": "Unofficial desktop app for E2E encrypted email providers",
"version": "1.5.5",
"version": "2.0.0-beta.7",
"author": "Vladimir Yakovlev <[email protected]>",
"license": "MIT",
"homepage": "https://github.com/vladimiry/email-securely-app",
Expand Down
2 changes: 2 additions & 0 deletions src/electron-main/app-update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import logger from "electron-log";
import {autoUpdater} from "electron-updater";

export function initAutoUpdate() {
autoUpdater.channel = "beta";
autoUpdater.allowDowngrade = false;
autoUpdater.logger = logger;
autoUpdater.checkForUpdatesAndNotify();
}
5 changes: 0 additions & 5 deletions src/web/src/app/_accounts/account.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {ACCOUNTS_ACTIONS, NAVIGATION_ACTIONS} from "src/web/src/app/store/action
import {APP_NAME, ONE_SECOND_MS} from "src/shared/constants";
import {AccountConfig} from "src/shared/model/account";
import {AccountsSelectors, OptionsSelectors} from "src/web/src/app/store/selectors";
import {BuildEnvironment} from "src/shared/model/common";
import {DbViewModuleResolve} from "./db-view-module-resolve.service";
import {IPC_MAIN_API_NOTIFICATION_ACTIONS} from "src/shared/api/main";
import {NgChangesObservableComponent} from "src/web/src/app/components/ng-changes-observable.component";
Expand Down Expand Up @@ -252,10 +251,6 @@ export class AccountComponent extends NgChangesObservableComponent implements On
})),
);

if ((process.env.NODE_ENV as BuildEnvironment) !== "development") {
return;
}

this.domReadySubscription.add(
((state: { stopSyncingDeferred?: Deferred<void> } = {}) => {
return this.account$
Expand Down
2 changes: 1 addition & 1 deletion src/web/src/app/_options/account-edit.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span *ngIf="account; else label">{{ account.login }}</span>
<ng-template #label>Add Account</ng-template>
</div>
<div class="form-check float-md-right" *ngIf="typeControlDisplayable && controls.type.value == 'tutanota'">
<div class="form-check float-md-right">
<label class="form-check-label">
<input type="checkbox" class="form-check-input" formControlName="database">
Local store
Expand Down
8 changes: 1 addition & 7 deletions src/web/src/app/_options/account-edit.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ export class AccountEditComponent implements OnInit, OnDestroy {
mailPassword: new FormControl(null),
};
form = new FormGroup(this.controls);
// TODO release: remove temporary "typeControlDisplayable" property
typeControlDisplayable: boolean = false;
// account
account?: AccountConfig;
account$: Observable<AccountConfig> = merge(this.activatedRoute.params, this.activatedRoute.queryParams).pipe(
Expand All @@ -52,11 +50,7 @@ export class AccountEditComponent implements OnInit, OnDestroy {

constructor(private optionsService: OptionsService,
private store: Store<State>,
private activatedRoute: ActivatedRoute) {
if ((process.env.NODE_ENV/* as BuildEnvironment*/) === "development") {
this.typeControlDisplayable = true;
}
}
private activatedRoute: ActivatedRoute) {}

ngOnInit() {
const {controls} = this;
Expand Down

0 comments on commit 8b423e7

Please sign in to comment.