From: Andy Spencer <andy753421@gmail.com>
Date: Tue, 23 Apr 2013 05:59:03 +0000 (+0000)
Subject: Update preferences
X-Git-Url: http://pileus.org/git/?p=~andy%2Fspades;a=commitdiff_plain;h=dcb8830d7e35bf607120f0df433e694189e50ff8

Update preferences

Add config option for game referee
Change default value of channel
Move setting default prefs to main
---

diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index e371c0a..394fd86 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -26,7 +26,12 @@
 			android:key="pref_channel"
 			android:summary="IRC Channel to Join"
 			android:title="Channel"
-			android:defaultValue="#rhtest" />
+			android:defaultValue="#rhspades" />
+		<EditTextPreference
+			android:key="pref_referee"
+			android:summary="Name of the bot hosting the game"
+			android:title="Referee"
+			android:defaultValue="rhawk" />
 	</PreferenceCategory>
 	<PreferenceCategory
 		android:title="Authentication settings"
diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java
index f85e06f..07c4ace 100644
--- a/src/org/pileus/spades/Main.java
+++ b/src/org/pileus/spades/Main.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Messenger;
+import android.preference.PreferenceManager;
 import android.text.Html;
 import android.text.method.ScrollingMovementMethod;
 import android.text.format.DateFormat;
@@ -217,6 +218,9 @@ public class Main extends Activity
 			super.onCreate(savedInstanceState);
 			Os.debug("Main: onCreate");
 
+			// Setup preferences
+			PreferenceManager.setDefaultValues(this, R.xml.prefs, false);
+
 			// Setup main layout
 			this.setContentView(R.layout.main);
 
@@ -257,7 +261,9 @@ public class Main extends Activity
 					.setContent(R.id.debug));
 
 			// Setup Spades game and cards view
-			this.game  = new Spades("rhawk");
+			this.game  = new Spades(PreferenceManager
+					.getDefaultSharedPreferences(this)
+					.getString("pref_referee", "rhawk"));
 			this.cards = new Cards(this);
 
 			this.game.cards = this.cards;
diff --git a/src/org/pileus/spades/Task.java b/src/org/pileus/spades/Task.java
index 8d1c3b4..a606d90 100644
--- a/src/org/pileus/spades/Task.java
+++ b/src/org/pileus/spades/Task.java
@@ -195,7 +195,6 @@ public class Task extends Service implements Runnable
 		this.lock   = new ReentrantLock();
 		this.client = new Client();
 		this.prefs  = PreferenceManager.getDefaultSharedPreferences(this);
-		PreferenceManager.setDefaultValues(this, R.xml.prefs, false);
 	}
 
 	@Override