From 947f1e5adc8beffcc79cfc54a1ccc997dfd9aefe Mon Sep 17 00:00:00 2001
From: bju <bju@maxi.fritz.box>
Date: Mon, 23 Jul 2018 00:51:34 +0200
Subject: Feature #2557: Added support for IPv6

---
 .../de.bjusystems.vdrmanager/src/main/res/values-de/strings.xml  | 2 ++
 .../de.bjusystems.vdrmanager/src/main/res/values/arrays.xml      | 8 ++++++--
 .../de.bjusystems.vdrmanager/src/main/res/values/strings.xml     | 9 +++++++++
 .../de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml      | 9 +++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'vdrmanager/de.bjusystems.vdrmanager/src/main/res')

diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-de/strings.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-de/strings.xml
index 0ae6b80..7a7d365 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-de/strings.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-de/strings.xml
@@ -137,6 +137,8 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="vdr_password_summary">Passwort für das VDR Plugin</string>
   <string name="vdr_ssl_title">Sichere Verbindung</string>
   <string name="vdr_ssl_summary">Verwende SSL für Verbindungen (aktuell nicht implementiert)</string>
+  <string name="vdr_ip46_mode_title">IPv4/6 Auswahl</string>
+  <string name="vdr_ip46_mode_summary">IPv4/6 Auswahl-Modus</string>
   <!-- channel filter preferences -->
   <string name="channel_filter_preferences">Kanaleinstellungen</string>
   <string name="channel_filter_filter_title">Begrenze Kanäle</string>
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml
index c0398bd..d53afcb 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml
@@ -46,8 +46,12 @@
         <item>has</item>
         <item>hls</item>
       </array>
-  
-
 
+    <string-array name="vdr_ip46_mode_values">
+        <item>ip4</item>
+        <item>ip6</item>
+        <item>ip46</item>
+        <item>ip64</item>
+    </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml
index 5176908..3a21c46 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml
@@ -148,6 +148,15 @@
     <string name="vdr_password_summary">Password for the VDR plugin</string>
     <string name="vdr_ssl_title">Secure connect</string>
     <string name="vdr_ssl_summary">Use SSL for connections</string>
+    <string name="vdr_ip46_mode_title">IPv4/6 selection</string>
+    <string name="vdr_ip46_mode_summary">IPv4/6 selection mode</string>
+
+    <string-array name="vdr_ip46_mode">
+        <item>Use only IPv4</item>
+        <item>Use only IPv6</item>
+        <item>Prefer IPv4 over IPv6</item>
+        <item>Prefer IPv6 over IPv4</item>
+    </string-array>
 
     <!-- channel filter preferences -->
     <string name="channel_filter_preferences">Channel settings</string>
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml
index efd13f8..b221b3f 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml
@@ -32,6 +32,15 @@
             android:enabled="true"
             android:summary="@string/vdr_ssl_summary"
             android:title="@string/vdr_ssl_title" />
+
+        <ListPreference
+            android:entries="@array/vdr_ip46_mode"
+            android:entryValues="@array/vdr_ip46_mode_values"
+            android:defaultValue="ip4_only"
+            android:key="vdr_ip46_mode"
+            android:title="@string/vdr_ip46_mode_title"
+            android:summary="@string/vdr_ip46_mode_summary"/>
+
     </PreferenceCategory>
     <PreferenceCategory
         android:key="filter_preferences"
-- 
cgit v1.2.3