Added settings for chat auto refresh

5 files changed, 67 insertions, 5 deletions

diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 30bf5230..b61895dc 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -274,7 +274,8 @@
 	<string name="settings.persistent_summary">Show the notification even after pausing.  Press the stop button to clear it away.</string>

 	<string name="settings.gapless_playback">Gapless Playback</string>

 	<string name="settings.gapless_playback_summary">The Galaxy S3 seems to be experiencing freezes/other weird issue since the introduction of gapless playback.  Turn this off to fix the issue.</string>

-	

+	<string name="settings.chat_refresh">Chat Refresh Rate (Secs)</string>

+

 	<string name="shuffle.startYear">Start Year:</string>

 	<string name="shuffle.endYear">End Year:</string>

 	<string name="shuffle.genre">Genre:</string>

diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml
index efa4a7da..49c8a634 100644
--- a/subsonic-android/res/xml/settings.xml
+++ b/subsonic-android/res/xml/settings.xml
@@ -129,6 +129,16 @@
 
     </PreferenceCategory>
 
+	<PreferenceCategory
+		android:title="@string/button_bar.chat">
+		
+		<EditTextPreference
+                android:title="@string/settings.chat_refresh"
+                android:key="chatRefreshRate"
+                android:defaultValue="30"
+				android:digits="0123456789"/>
+	</PreferenceCategory>
+
     <PreferenceCategory
             android:title="@string/settings.other_title">
 
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
index 773f4def..4fdf8431 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -68,6 +68,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 	private EditTextPreference bufferLength;
 	private Preference addServerPreference;
 	private PreferenceCategory serversCategory;
+	private EditTextPreference chatRefreshRate;
 	
 	private int serverCount = 3;
 	private SharedPreferences settings;
@@ -93,6 +94,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		bufferLength = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_BUFFER_LENGTH);
 		addServerPreference = (Preference) findPreference(Constants.PREFERENCES_KEY_SERVER_ADD);
 		serversCategory = (PreferenceCategory) findPreference(Constants.PREFERENCES_KEY_SERVER_KEY);
+		chatRefreshRate = (EditTextPreference) findPreference(Constants.PREFERENCES_KEY_CHAT_REFRESH);
 		
 		settings = Util.getPreferences(this);
 		serverCount = settings.getInt(Constants.PREFERENCES_KEY_SERVER_COUNT, 3);
@@ -188,6 +190,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		randomSize.setSummary(randomSize.getText());
 		tempLoss.setSummary(tempLoss.getEntry());
 		bufferLength.setSummary(bufferLength.getText() + " seconds");
+		chatRefreshRate.setSummary(chatRefreshRate.getText());
         for (ServerSettings ss : serverSettings.values()) {
             ss.update();
         }
diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/ChatFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/ChatFragment.java
index 35470721..44114681 100644
--- a/subsonic-android/src/github/daneren2005/dsub/fragments/ChatFragment.java
+++ b/subsonic-android/src/github/daneren2005/dsub/fragments/ChatFragment.java
@@ -1,12 +1,15 @@
 package github.daneren2005.dsub.fragments;

 

 import android.content.Context;

+import android.content.SharedPreferences;

 import java.util.ArrayList;

 import java.util.Collections;

 import java.util.List;

 import android.os.Bundle;

+import android.os.Handler;

 import android.text.Editable;

 import android.text.TextWatcher;

+import android.util.Log;

 import android.view.KeyEvent;

 import android.view.LayoutInflater;

 import android.view.View;

@@ -27,16 +30,22 @@ import github.daneren2005.dsub.util.TabBackgroundTask;
 import github.daneren2005.dsub.util.Util;

 import github.daneren2005.dsub.view.ChatAdapter;

 import com.actionbarsherlock.view.Menu;

+import github.daneren2005.dsub.util.Constants;

+import java.util.concurrent.Executors;

+import java.util.concurrent.ScheduledExecutorService;

+import java.util.concurrent.TimeUnit;

 

 /**

  * @author Joshua Bahnsen

  */

 public class ChatFragment extends SubsonicFragment {

+	private static final String TAG = ChatFragment.class.getSimpleName();

 	private ListView chatListView;

 	private EditText messageEditText;

 	private ImageButton sendButton;

 	private Long lastChatMessageTime = (long) 0;

 	private ArrayList<ChatMessage> messageList = new ArrayList<ChatMessage>();

+	private ScheduledExecutorService executorService;

 

 	@Override

 	public void onCreate(Bundle bundle) {

@@ -93,6 +102,39 @@ public class ChatFragment extends SubsonicFragment {
 	}

 	

 	@Override

+	public void onResume() {

+		super.onResume();

+		

+		final Handler handler = new Handler();

+		Runnable runnable = new Runnable() {

+			@Override

+			public void run() {

+				handler.post(new Runnable() {

+					@Override

+					public void run() {

+						if(primaryFragment) {

+							load(false);

+						} else {

+							invalidated = true;

+						}

+					}

+				});

+			}

+		};

+

+		SharedPreferences prefs = Util.getPreferences(context);

+		long refreshRate = Integer.parseInt(prefs.getString(Constants.PREFERENCES_KEY_CHAT_REFRESH, "30"));

+		executorService = Executors.newSingleThreadScheduledExecutor();

+		executorService.scheduleWithFixedDelay(runnable, refreshRate * 1000L, refreshRate * 1000L, TimeUnit.MILLISECONDS);

+	}

+	

+	@Override

+	public void onPause() {

+		super.onPause();

+		executorService.shutdown();

+	}

+	

+	@Override

 	public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {

 		menuInflater.inflate(R.menu.empty, menu);

 	}

@@ -108,21 +150,26 @@ public class ChatFragment extends SubsonicFragment {
 	

 	@Override

 	protected void refresh(boolean refresh) {

-		load();

+		load(refresh);

 	}

 	

-	private synchronized void load() {

+	private synchronized void load(final boolean refresh) {

+		Log.i(TAG, "Loading: " + refresh);

 		setTitle(R.string.button_bar_chat);

 		BackgroundTask<List<ChatMessage>> task = new TabBackgroundTask<List<ChatMessage>>(this) {

 			@Override

 			protected List<ChatMessage> doInBackground() throws Throwable {

 				MusicService musicService = MusicServiceFactory.getMusicService(context);

-				return musicService.getChatMessages(lastChatMessageTime, context, this);

+				return musicService.getChatMessages(refresh ? 0L : lastChatMessageTime, context, this);

 			}

 

 			@Override

 			protected void done(List<ChatMessage> result) {

 				if (result != null && !result.isEmpty()) {

+					if(refresh) {

+						messageList.clear();

+					}

+					

 					// Reset lastChatMessageTime if we have a newer message

 					for (ChatMessage message : result) {

 						if (message.getTime() > lastChatMessageTime) {

@@ -161,7 +208,7 @@ public class ChatFragment extends SubsonicFragment {
 

 				@Override

 				protected void done(Void result) {

-					load();

+					load(false);

 				}

 			};

 

diff --git a/subsonic-android/src/github/daneren2005/dsub/util/Constants.java b/subsonic-android/src/github/daneren2005/dsub/util/Constants.java
index b6cb3d89..e82b8111 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/Constants.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/Constants.java
@@ -101,6 +101,7 @@ public final class Constants {
 	public static final String PREFERENCES_KEY_PERSISTENT_NOTIFICATION = "persistentNotification";
 	public static final String PREFERENCES_KEY_GAPLESS_PLAYBACK = "gaplessPlayback";
 	public static final String PREFERENCES_KEY_SHUFFLE_MODE = "shuffleMode";
+	public static final String PREFERENCES_KEY_CHAT_REFRESH = "chatRefreshRate";
 	
 	public static final String MAIN_BACK_STACK = "backStackIds";
 	public static final String MAIN_BACK_STACK_SIZE = "backStackIdsSize";