From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 29 Jul 2013 08:26:13 +0000 (+0300)
Subject: Make server protocol configurable
X-Git-Tag: 0.000_001~18
X-Git-Url: http://git.ieval.ro/?p=fonbot.git;a=commitdiff_plain;h=1443a92948e04e18b32a49e3f60fb1a31f6fa871

Make server protocol configurable
---

diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index ceaf223..cc881fe 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -6,7 +6,8 @@
     <CheckBoxPreference android:title="Device administration" android:summaryOn="Device administration is enabled." android:key="admin" android:summaryOff="Device administration is disabled. Some commands require device administration."/>
 	<CheckBoxPreference android:key="foreground" android:title="Run service in foreground" android:summaryOn="The FonBot service is kept in foreground. " android:summaryOff="The FonBot service is not kept in foreground."/>
     <CheckBoxPreference android:key="system" android:summaryOff="FonBot is not a system app. Changing this requires root and busybox" android:title="System App" android:summaryOn="FonBot is a system app. Changing this requires root and busybox"/>
-    
+
+	<EditTextPreference android:dialogTitle="Server protocol" android:title="Server protocol" android:dialogMessage="Server protocol. Do not change unless you know what you are doing!" android:key="protocol" android:defaultValue="https" android:summary="https"/>
     <EditTextPreference android:dialogTitle="Server hostname" android:title="Server hostname" android:dialogMessage="Server hostname. Do not change unless you know what you are doing!" android:key="hostname" android:defaultValue="fonbot.ieval.ro" android:summary="fonbot.ieval.ro"/>
     <EditTextPreference android:dialogMessage="Server port. Do not change unless you know what you are doing!" android:dialogTitle="Server port" android:title="Server port" android:summary="443" android:defaultValue="7777" android:key="port"/>
 </PreferenceScreen>
diff --git a/src/ro/ieval/fonbot/FonBotPreferenceActivity.java b/src/ro/ieval/fonbot/FonBotPreferenceActivity.java
index 05a6c65..89b8682 100644
--- a/src/ro/ieval/fonbot/FonBotPreferenceActivity.java
+++ b/src/ro/ieval/fonbot/FonBotPreferenceActivity.java
@@ -139,6 +139,19 @@ public final class FonBotPreferenceActivity extends PreferenceActivity {
 			}
 		});
 
+		final EditTextPreference protocolPreference=(EditTextPreference) findPreference("protocol");
+		protocolPreference.setSummary(protocolPreference.getText());
+		protocolPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+			@Override
+			public boolean onPreferenceChange(final @Nullable Preference preference, final @Nullable Object newValue) {
+				if(newValue==null)
+					return false;
+
+				protocolPreference.setSummary(newValue.toString());
+				return true;
+			}
+		});
+
 		final EditTextPreference hostnamePreference=(EditTextPreference) findPreference("hostname");
 		hostnamePreference.setSummary(hostnamePreference.getText());
 		hostnamePreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
diff --git a/src/ro/ieval/fonbot/Utils.java b/src/ro/ieval/fonbot/Utils.java
index 5f7f69c..5c54f86 100644
--- a/src/ro/ieval/fonbot/Utils.java
+++ b/src/ro/ieval/fonbot/Utils.java
@@ -382,9 +382,10 @@ public final class Utils {
 	 * @throws MalformedURLException if the user preferences create an invalid URL
 	 */
 	public static URL getServerURL(final Context context, final String path) throws MalformedURLException{
+		final String protocol=PreferenceManager.getDefaultSharedPreferences(context).getString("protocol", "https");
 		final String hostname=PreferenceManager.getDefaultSharedPreferences(context).getString("hostname", "fonbot.ieval.ro");
 		final int port=Integer.parseInt(PreferenceManager.getDefaultSharedPreferences(context).getString("port", "443"));
-		final URL url=new URL("http", hostname, port, path);
+		final URL url=new URL(protocol, hostname, port, path);
 		return url;
 	}