From 0c894a541da6e26fae68c0c00dcde021b95a0995 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Mon, 12 Sep 2022 12:44:37 +0200
Subject: [PATCH] networks.txt: remove region Poland

---
 oeffi/assets/networks.txt                                   | 3 ---
 oeffi/res/values-de/networks.xml                            | 2 --
 oeffi/res/values/networks.xml                               | 2 --
 oeffi/res/xml/network_security_config.xml                   | 1 -
 oeffi/src/de/schildbach/oeffi/Application.java              | 6 ++++++
 .../de/schildbach/oeffi/network/NetworkProviderFactory.java | 3 ---
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt
index 5fe780e..4d55956 100644
--- a/oeffi/assets/networks.txt
+++ b/oeffi/assets/networks.txt
@@ -87,9 +87,6 @@ MERSEY|en-UK|GB;Liverpool|beta
 # IE
 TFI|ga-IE|IE;Dublin;GB;Belfast
 
-# PL
-PL|pl-PL|PL;Warschau
-
 # AE
 DUB|ae-AE|AE;Dubai|beta
 
diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml
index 5ec93de..42c4501 100644
--- a/oeffi/res/values-de/networks.xml
+++ b/oeffi/res/values-de/networks.xml
@@ -113,8 +113,6 @@
     <string name="network_mersey_comment">Lokal- und Regionalverkehr</string>
     <string name="network_tfi_label">Irland &amp; Nordirland</string>
     <string name="network_tfi_comment">Lokal- und Regionalverkehr</string>
-    <string name="network_pl_label">Polen</string>
-    <string name="network_pl_comment">Fern-, Regional und Lokalverkehr (z.B. Warschau)</string>
     <string name="network_dub_label">Dubai</string>
     <string name="network_dub_comment">Lokalverkehr</string>
     <string name="network_bart_label">San Francisco</string>
diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml
index 8a2eca1..41aa840 100644
--- a/oeffi/res/values/networks.xml
+++ b/oeffi/res/values/networks.xml
@@ -113,8 +113,6 @@
     <string name="network_mersey_comment">local and regional</string>
     <string name="network_tfi_label">Ireland &amp; Northern Ireland</string>
     <string name="network_tfi_comment">local and regional</string>
-    <string name="network_pl_label">Poland</string>
-    <string name="network_pl_comment">long-distance, regional and local (e.g. Warsaw)</string>
     <string name="network_dub_label">Dubai</string>
     <string name="network_dub_comment">local</string>
     <string name="network_bart_label">San Francisco</string>
diff --git a/oeffi/res/xml/network_security_config.xml b/oeffi/res/xml/network_security_config.xml
index 7f0db28..fcaaaa5 100644
--- a/oeffi/res/xml/network_security_config.xml
+++ b/oeffi/res/xml/network_security_config.xml
@@ -17,7 +17,6 @@
         <domain includeSubdomains="false">railteam.hafas.eu</domain><!-- Railteam -->
         <domain includeSubdomains="false">mobil.vbl.ch</domain><!-- VBL -->
         <domain includeSubdomains="false">efa.vvo-online.de</domain><!-- VVO -->
-        <domain includeSubdomains="false">mobil.rozklad-pkp.pl</domain><!-- PKP -->
     </domain-config>
 
 </network-security-config>
diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java
index 9493840..f7f88cd 100644
--- a/oeffi/src/de/schildbach/oeffi/Application.java
+++ b/oeffi/src/de/schildbach/oeffi/Application.java
@@ -115,6 +115,12 @@ public class Application extends android.app.Application {
         FavoriteStationsProvider.deleteFavoriteStations(this, SBB);
         QueryHistoryProvider.deleteQueryHistory(this, SBB);
 
+        // 2022-09-12: migrate PL to use RT
+        final String PL = "PL";
+        migrateSelectedNetwork(PL, NetworkId.RT);
+        FavoriteStationsProvider.deleteFavoriteStations(this, PL);
+        QueryHistoryProvider.deleteQueryHistory(this, PL);
+
         log.info("Migrations took {}", watch);
     }
 
diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
index c76ca61..d7becb4 100644
--- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
+++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
@@ -50,7 +50,6 @@ import de.schildbach.pte.NvbwProvider;
 import de.schildbach.pte.NvvProvider;
 import de.schildbach.pte.OebbProvider;
 import de.schildbach.pte.ParisProvider;
-import de.schildbach.pte.PlProvider;
 import de.schildbach.pte.RtProvider;
 import de.schildbach.pte.RtaChicagoProvider;
 import de.schildbach.pte.SeProvider;
@@ -203,8 +202,6 @@ public final class NetworkProviderFactory {
             return new MerseyProvider();
         else if (networkId.equals(NetworkId.TFI))
             return new TfiProvider();
-        else if (networkId.equals(NetworkId.PL))
-            return new PlProvider();
         else if (networkId.equals(NetworkId.DUB))
             return new DubProvider();
         else if (networkId.equals(NetworkId.BART))