Skip to content

Commit 3eb0c81

Browse files
committed
MOBILE-3039 core: Fix getStoredConfig error in synchronize
1 parent 136869c commit 3eb0c81

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/core/mainmenu/pages/more/more.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ export class CoreMainMenuMorePage implements OnDestroy {
7272
*/
7373
ngOnDestroy(): void {
7474
window.removeEventListener('resize', this.initHandlers.bind(this));
75+
this.langObserver && this.langObserver.off();
76+
this.updateSiteObserver && this.updateSiteObserver.off();
7577

7678
if (this.subscription) {
7779
this.subscription.unsubscribe();

src/providers/sites.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { CoreConfigConstants } from '../configconstants';
2727
import { CoreSite } from '@classes/site';
2828
import { SQLiteDB, SQLiteDBTableSchema } from '@classes/sqlitedb';
2929
import { Md5 } from 'ts-md5/dist/md5';
30+
import { Location } from '@angular/common';
3031

3132
/**
3233
* Response of checking if a site exists and its configuration.
@@ -320,7 +321,7 @@ export class CoreSitesProvider {
320321

321322
constructor(logger: CoreLoggerProvider, private http: HttpClient, private sitesFactory: CoreSitesFactoryProvider,
322323
private appProvider: CoreAppProvider, private translate: TranslateService, private urlUtils: CoreUrlUtilsProvider,
323-
private eventsProvider: CoreEventsProvider, private textUtils: CoreTextUtilsProvider,
324+
private eventsProvider: CoreEventsProvider, private textUtils: CoreTextUtilsProvider, private location: Location,
324325
private utils: CoreUtilsProvider) {
325326
this.logger = logger.getInstance('CoreSitesProvider');
326327

@@ -1161,6 +1162,9 @@ export class CoreSitesProvider {
11611162
promises.push(this.appDB.deleteRecords(this.CURRENT_SITE_TABLE, { id: 1 }));
11621163

11631164
return Promise.all(promises).finally(() => {
1165+
// Due to DeepLinker, we need to remove the path from the URL, otherwise some pages are re-created when they shouldn't.
1166+
this.location.replaceState('');
1167+
11641168
this.eventsProvider.trigger(CoreEventsProvider.LOGOUT, {}, siteId);
11651169
});
11661170
}

0 commit comments

Comments
 (0)