WallyHackenslacker/moasdawiki-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to moasdawiki-server 2.4.2

Browse Source
This commit is contained in:
Herbert Reiter
2020-12-28 12:28:54 +01:00
parent 203d225955
commit 267f0c84fb
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/net/moasdawiki/app/WikiEngineApplication.java
+9 -7
View File
@@ -54,6 +54,7 @@ public class WikiEngineApplication extends Application {
private Settings settings; private Settings settings;
private Messages messages; private Messages messages;
private WikiService wikiService; private WikiService wikiService;
private SearchService searchService;
private SynchronizeWikiClient synchronizeWikiClient; private SynchronizeWikiClient synchronizeWikiClient;
private TerminTransformer terminTransformer; private TerminTransformer terminTransformer;
private RequestDispatcher requestDispatcher; private RequestDispatcher requestDispatcher;
@@ -68,12 +69,11 @@ public class WikiEngineApplication extends Application {
File internalStorageRepositoryRoot = new File(getFilesDir(), REPOSITORY_ROOT_PATH_DEFAULT); File internalStorageRepositoryRoot = new File(getFilesDir(), REPOSITORY_ROOT_PATH_DEFAULT);
// basic services // basic services
repositoryService = new RepositoryService(logger, internalStorageRepositoryRoot); repositoryService = new RepositoryService(logger, internalStorageRepositoryRoot, false);
repositoryService.init();
settings = new AndroidSettings(logger, repositoryService, Settings.getConfigFileApp()); settings = new AndroidSettings(logger, repositoryService, Settings.getConfigFileApp());
messages = new Messages(logger, settings, repositoryService); messages = new Messages(logger, settings, repositoryService);
wikiService = new WikiService(logger, repositoryService); wikiService = new WikiService(logger, repositoryService, false);
SearchService searchService = new SearchService(logger, repositoryService, wikiService, false); searchService = new SearchService(logger, repositoryService, wikiService, false);
// App: use SynchronizeWikiClient instead of SynchronizationService // App: use SynchronizeWikiClient instead of SynchronizationService
synchronizeWikiClient = new SynchronizeWikiClient(this, logger, settings, repositoryService); synchronizeWikiClient = new SynchronizeWikiClient(this, logger, settings, repositoryService);
@@ -82,7 +82,7 @@ public class WikiEngineApplication extends Application {
// do not run the SynchronizationPageTransformer // do not run the SynchronizationPageTransformer
IncludePageTransformer includePageTransformer = new IncludePageTransformer(logger, wikiService); IncludePageTransformer includePageTransformer = new IncludePageTransformer(logger, wikiService);
KontaktseiteTransformer kontaktseiteTransformer = new KontaktseiteTransformer(); KontaktseiteTransformer kontaktseiteTransformer = new KontaktseiteTransformer();
terminTransformer = new TerminTransformer(logger, messages, repositoryService, wikiService); terminTransformer = new TerminTransformer(logger, messages, repositoryService, wikiService, false);
WikiTagsTransformer wikiTagsTransformer = new WikiTagsTransformer(logger, settings, messages, wikiService); WikiTagsTransformer wikiTagsTransformer = new WikiTagsTransformer(logger, settings, messages, wikiService);
// list of transformers, the order matters // list of transformers, the order matters
TransformWikiPage[] transformers = {includePageTransformer, kontaktseiteTransformer, terminTransformer, wikiTagsTransformer}; TransformWikiPage[] transformers = {includePageTransformer, kontaktseiteTransformer, terminTransformer, wikiTagsTransformer};
@@ -101,10 +101,12 @@ public class WikiEngineApplication extends Application {
} }
public void resetServices() { public void resetServices() {
repositoryService.rebuildCache(); repositoryService.reset();
wikiService.reset();
settings.reset(); settings.reset();
messages.reset(); messages.reset();
wikiService.reset();
searchService.reset();
terminTransformer.reset();
} }
@Override @Override