Update copyright year

This commit is contained in:
Herbert Reiter
2021-12-25 15:51:36 +01:00
parent e27651e9dd
commit ce33ef40d6
12 changed files with 20 additions and 23 deletions
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -64,7 +64,6 @@ import org.jetbrains.annotations.Nullable;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.InetAddress;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
@@ -171,14 +170,8 @@ public class MainActivity extends AppCompatActivity {
} }
// dispatch URL path // dispatch URL path
HttpRequest httpRequest = new HttpRequest(); HttpRequest httpRequest = new HttpRequest(Collections.emptyMap(),
httpRequest.clientIP = InetAddress.getLocalHost(); "GET", urlPath, urlPath, convertParameters(uri), new byte[0]);
httpRequest.httpHeader = Collections.emptyMap();
httpRequest.method = "GET";
httpRequest.url = urlPath;
httpRequest.urlPath = urlPath;
httpRequest.urlParameters = convertParameters(uri);
httpRequest.httpBody = new byte[0];
HttpResponse response = requestDispatcher.handleRequest(httpRequest); HttpResponse response = requestDispatcher.handleRequest(httpRequest);
// send wiki content to browser // send wiki content to browser
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2021 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
@@ -28,6 +28,8 @@ import net.moasdawiki.service.handler.SearchHandler;
import net.moasdawiki.service.handler.ViewPageHandler; import net.moasdawiki.service.handler.ViewPageHandler;
import net.moasdawiki.service.render.HtmlService; import net.moasdawiki.service.render.HtmlService;
import net.moasdawiki.service.repository.RepositoryService; import net.moasdawiki.service.repository.RepositoryService;
import net.moasdawiki.service.search.SearchIgnoreList;
import net.moasdawiki.service.search.SearchIndex;
import net.moasdawiki.service.search.SearchService; import net.moasdawiki.service.search.SearchService;
import net.moasdawiki.service.transform.IncludePageTransformer; import net.moasdawiki.service.transform.IncludePageTransformer;
import net.moasdawiki.service.transform.KontaktseiteTransformer; import net.moasdawiki.service.transform.KontaktseiteTransformer;
@@ -67,11 +69,13 @@ 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, false); repositoryService = new RepositoryService(logger, internalStorageRepositoryRoot, null, false);
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, false); wikiService = new WikiService(logger, repositoryService, false);
searchService = new SearchService(logger, repositoryService, wikiService, false); SearchIgnoreList searchIgnoreList = new SearchIgnoreList(logger, repositoryService);
SearchIndex searchIndex = new SearchIndex(logger, repositoryService, wikiService, searchIgnoreList, true);
searchService = new SearchService(logger, wikiService, searchIgnoreList, searchIndex, 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);