From 79b5b09db6be136f742c69f96039ec2eeee43063 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Wed, 26 Jan 2011 03:32:36 +0100
Subject: [PATCH] preferences for backends

---
 AndroidManifest.xml     |  4 +++-
 res/values/notrans.xml  |  1 +
 res/values/strings.xml  | 27 +++++++++++++++++++++------
 res/xml/pref_afsk.xml   | 19 +++++++++++++++++++
 res/xml/pref_tcp.xml    | 35 +++++++++++++++++++++++++++++++++++
 res/xml/pref_udp.xml    | 20 ++++++++++++++++++++
 res/xml/preferences.xml | 34 +++++++++++++---------------------
 src/BackendPrefs.scala  | 12 ++++++++++++
 8 files changed, 124 insertions(+), 28 deletions(-)
 create mode 100644 res/xml/pref_afsk.xml
 create mode 100644 res/xml/pref_tcp.xml
 create mode 100644 res/xml/pref_udp.xml
 create mode 100644 src/BackendPrefs.scala

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2977f70..6d5a62d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,11 +20,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".PrefsAct" android:label="@string/app_prefs" />
+	<activity android:name=".PrefsAct" android:label="@string/app_prefs" />
+	<activity android:name=".BackendPrefs" android:label="@string/app_prefs" />
         <activity android:name=".MapAct" android:label="@string/app_map"
 		android:theme="@android:style/Theme.NoTitleBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+		<category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 	</activity>
 	<service android:name=".AprsService">
diff --git a/res/values/notrans.xml b/res/values/notrans.xml
index 7f830fc..8c8e5cd 100644
--- a/res/values/notrans.xml
+++ b/res/values/notrans.xml
@@ -5,5 +5,6 @@
 
 <string name="default_status">http://aprsdroid.org/</string>
 <string name="default_symbol">/$</string>
+<string name="p_conntype_default" value="tcp" />
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e55dd07..859b987 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,10 +101,12 @@
 <string name="p_status">Status message</string>
 <string name="p_status_summary">The text after your coordinates</string>
 <string name="p_status_entry">Enter your status message</string>
-<string name="p__network">Networking</string>
+<string name="p__connection">APRS Connection</string>
 <string name="p_conntype">Connection Protocol</string>
-<string name="p_conntype_summary">Choose UDP (port 8080) or HTTP POST (URL)</string>
+<string name="p_conntype_summary">AFSK, HTTP, TCP or UDP</string>
 <string name="p_conntype_entry">Choose the connection protocol</string>
+<string name="p_connsetup">Connection Preferences</string>
+<string name="p_connsetup_summary">Configuration of Connection</string>
 <!-- array of connection types -->
 <string-array name="p_conntype_e">
 	<item>UDP port 8080</item>
@@ -115,6 +117,7 @@
 <string name="p_host">Server</string>
 <string name="p_host_summary">APRS-IS server (port 8080) to send beacons</string>
 <string name="p_host_entry">Enter the APRS-IS server hostname</string>
+<string name="p_host_hint">host:port</string>
 <string name="p__location">Location Settings</string>
 <string name="p_interval">Minimum update time</string>
 <string name="p_interval_summary">Minutes between beacon transmissions</string>
@@ -126,8 +129,20 @@
 <string name="p_speedbrg_summary">Keep GPS on longer to get more precise data</string>
 <string name="p_netloc">Use network location</string>
 <string name="p_netloc_summary">Acquire position from the cellular network</string>
-<string name="p__filter">Incoming Filter (TCP only)</string>
-<string name="p_filterdist">Neighbor radius</string>
-<string name="p_filterdist_summary">Receive packets from stations in this radius</string>
-<string name="p_filterdist_entry">Radius around you to monitor for packets [km]</string>
+
+<string name="p_afsk">AFSK Preferences</string>
+<string name="p_http">HTTP Preferences</string>
+<string name="p_udp">UDP Preferences</string>
+<string name="p_tcp">TCP Preferences</string>
+
+<!-- TCP server settings -->
+<string name="p_tcp_server_summary">APRS-IS TCP server (port 14580) to contact</string>
+<string name="p_filter">Message filter</string>
+<string name="p_filter_hint">m/10 b/DO1GL*</string>
+<string name="p_filter_default">m/10</string>
+<string name="p_filter_summary">Filter for incoming packets</string>
+<string name="p_filter_entry">Enter a filter for incoming messages ("m/10" filters 10km around own position)</string>
+
+<string name="p_filterhelp">Message filter help</string>
+<string name="p_filterhelp_summary">Online reference for APRS-IS filters</string>
 </resources>
diff --git a/res/xml/pref_afsk.xml b/res/xml/pref_afsk.xml
new file mode 100644
index 0000000..5ff8b74
--- /dev/null
+++ b/res/xml/pref_afsk.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+	    android:title="TCP">
+
+        <EditTextPreference
+                android:key="host"
+		android:hint="@string/aprs_server"
+		android:inputType="textUri"
+		android:title="@string/p_host"
+		android:summary="@string/p_host_summary"
+		android:dialogTitle="@string/p_host_entry" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
+
diff --git a/res/xml/pref_tcp.xml b/res/xml/pref_tcp.xml
new file mode 100644
index 0000000..3ad71f1
--- /dev/null
+++ b/res/xml/pref_tcp.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+	    android:title="@string/p_tcp">
+
+        <EditTextPreference
+                android:key="tcp.server"
+		android:inputType="textUri"
+		android:title="@string/p_host"
+		android:summary="@string/p_tcp_server_summary"
+		android:hint="@string/p_host_hint"
+		android:defaultValue="@string/aprs_server"
+		android:dialogTitle="@string/p_host_entry" />
+
+        <EditTextPreference
+                android:key="tcp.filter"
+		android:title="@string/p_filter"
+		android:summary="@string/p_filter_summary"
+		android:hint="@string/p_filter_hint"
+		android:defaultValue="@string/p_filter_default"
+		android:dialogTitle="@string/p_filter_entry" />
+
+	<Preference
+		android:key="tcp.filter.help"
+		android:title="@string/p_filterhelp"
+		android:summary="@string/p_filterhelp_summary" >
+		<intent android:action="android.intent.action.VIEW"
+			android:data="http://www.aprs-is.net/javAPRSFilter.aspx" />
+	</Preference>
+    </PreferenceCategory>
+
+</PreferenceScreen>
+
diff --git a/res/xml/pref_udp.xml b/res/xml/pref_udp.xml
new file mode 100644
index 0000000..b035196
--- /dev/null
+++ b/res/xml/pref_udp.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+	    android:title="@string/p_udp">
+
+        <EditTextPreference
+                android:key="udp.server"
+		android:defaultValue="@string/aprs_server"
+		android:hint="@string/p_host_hint"
+		android:inputType="textUri"
+		android:title="@string/p_host"
+		android:summary="@string/p_host_summary"
+		android:dialogTitle="@string/p_host_entry" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
+
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 8efa654..e04a1a7 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -37,6 +37,7 @@
 		android:summary="@string/p_ssid_summary"
                 android:entries="@array/p_ssid_e"
                 android:entryValues="@array/p_ssid_ev"
+		android:defaultValue=""
 		android:dialogTitle="@string/p_ssid_entry" />
 
         <EditTextPreference
@@ -44,6 +45,7 @@
 		android:hint="@string/default_symbol"
 		android:title="@string/p_symbol"
 		android:summary="@string/p_symbol_summary"
+		android:defaultValue="@string/default_symbol"
 		android:dialogTitle="@string/p_symbol_entry" />
 
         <EditTextPreference
@@ -85,19 +87,7 @@
     </PreferenceCategory>
                 
     <PreferenceCategory
-	android:title="@string/p__filter">
-
-        <EditTextPreference
-                android:key="filterdist"
-		android:inputType="number"
-		android:title="@string/p_filterdist"
-		android:summary="@string/p_filterdist_summary"
-		android:dialogTitle="@string/p_filterdist_entry" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-	android:title="@string/p__network">
+	android:title="@string/p__connection">
 
         <ListPreference
                 android:key="conntype"
@@ -105,16 +95,18 @@
 		android:summary="@string/p_conntype_summary"
                 android:entries="@array/p_conntype_e"
                 android:entryValues="@array/p_conntype_ev"
+		android:defaultValue="@string/p_conntype_default"
 		android:dialogTitle="@string/p_conntype_entry" />
 
-        <EditTextPreference
-                android:key="host"
-		android:hint="@string/aprs_server"
-		android:inputType="textUri"
-		android:title="@string/p_host"
-		android:summary="@string/p_host_summary"
-		android:dialogTitle="@string/p_host_entry" />
-                
+        <PreferenceScreen
+		android:title="@string/p_connsetup"
+		android:summary="@string/p_connsetup_summary">
+
+            <intent android:action="android.intent.action.MAIN"
+                    android:targetPackage="de.duenndns.aprsdroid"
+                    android:targetClass="de.duenndns.aprsdroid.BackendPrefs" />
+
+        </PreferenceScreen>
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/src/BackendPrefs.scala b/src/BackendPrefs.scala
new file mode 100644
index 0000000..d2bf020
--- /dev/null
+++ b/src/BackendPrefs.scala
@@ -0,0 +1,12 @@
+package de.duenndns.aprsdroid
+
+import _root_.android.os.Bundle
+import _root_.android.preference.{PreferenceActivity, PreferenceManager}
+
+class BackendPrefs extends PreferenceActivity {
+	override def onCreate(savedInstanceState: Bundle) {
+		super.onCreate(savedInstanceState)
+		val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+		addPreferencesFromResource(AprsIsUploader.instanciatePrefsAct(prefs))
+	}
+}