Merge SyncAdapter

8 files changed, 93 insertions, 7 deletions

diff --git a/res/menu/select_playlist_context.xml b/res/menu/select_playlist_context.xml
index 0ec94e02..7cdc0c79 100644
--- a/res/menu/select_playlist_context.xml
+++ b/res/menu/select_playlist_context.xml
@@ -22,10 +22,13 @@
         android:title="@string/common.download"
         />
 
-    <item 
-        android:id="@+id/playlist_menu_pin"
-        android:title="@string/common.pin"
-        />
+	<item
+		android:id="@+id/playlist_menu_sync"
+		android:title="@string/menu.keep_synced"/>
+
+	<item
+		android:id="@+id/playlist_menu_stop_sync"
+		android:title="@string/menu.stop_sync"/>
 		
 	<item 
         android:id="@+id/playlist_update_info"
diff --git a/res/menu/select_podcasts_context.xml b/res/menu/select_podcasts_context.xml
index c9785b92..3a2a1c60 100644
--- a/res/menu/select_podcasts_context.xml
+++ b/res/menu/select_podcasts_context.xml
@@ -6,5 +6,13 @@
 		android:title="@string/common.info"/>
 	<item 
 		android:id="@+id/podcast_channel_delete"
-		android:title="@string/common.delete"/> 
+		android:title="@string/common.delete"/>
+
+	<item
+		android:id="@+id/podcast_menu_sync"
+		android:title="@string/menu.keep_synced"/>
+
+	<item
+		android:id="@+id/podcast_menu_stop_sync"
+		android:title="@string/menu.stop_sync"/>
 </menu>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 16288149..4b8caa96 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -194,4 +194,25 @@
 		<item>@string/settings.video_flash</item>
 	</string-array>
 
-</resources>
+	<string-array name="syncIntervalValues">
+		<item>15</item>
+		<item>30</item>
+		<item>60</item>
+		<item>120</item>
+		<item>240</item>
+		<item>360</item>
+		<item>720</item>
+		<item>1440</item>
+	</string-array>
+	<string-array name="syncIntervalNames">
+		<item>15 Minutes</item>
+		<item>30 Minutes</item>
+		<item>1 Hour</item>
+		<item>2 Hours</item>
+		<item>3 Hours</item>
+		<item>6 Hours</item>
+		<item>12 Hours</item>
+		<item>Daily</item>
+	</string-array>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b19c7b7d..a6de6759 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -75,6 +75,8 @@
 	<string name="menu.set_timer">Set Timer</string>

 	<string name="menu.check_podcasts">Check For New Episodes</string>

 	<string name="menu.add_podcast">Add Channel</string>

+	<string name="menu.keep_synced">Keep Synced</string>

+	<string name="menu.stop_sync">Stop syncing</string>

 

     <string name="playlist.label">Playlists</string>

 	<string name="playlist.update_info">Update Information</string>

@@ -309,7 +311,7 @@
     <string name="settings.media_button_summary">Respond to phone, headset and Bluetooth media buttons</string>

     <string name="settings.screen_lit_title">Keep screen on</string>

     <string name="settings.screen_lit_summary">Keeping the screen on while downloading improves download speed.</string>

-	<string name="settings.playlist_title">Playlists</string>

+	<string name="settings.playlist_title">Play</string>

 	<string name="settings.playlist_random_size_title">Random Size</string>

 	<string name="settings.buffer_length">Buffer Length (0 = when fully cached)</string>

 	<string name="settings.sleep_timer_title">Sleep Timer</string>

@@ -348,6 +350,12 @@
 	<string name="settings.podcasts_enabled_summary">Whether or not to display the podcast listing in the pull out drawer</string>

 	<string name="settings.bookmarks_enabled">Bookmarks Enabled</string>

 	<string name="settings.bookmarks_enabled_summary">Whether or not to display the bookmarks listing in the pull out drawer</string>

+	<string name="settings.sync_title">Sync</string>

+	<string name="settings.sync_enabled">Sync Enabled</string>

+	<string name="settings.sync_enabled_summary">Whether or not playlists or podcasts are periodically checked for changes</string>

+	<string name="settings.sync_interval">Sync Interval</string>

+	<string name="settings.sync_wifi">Sync on Wifi only</string>

+	<string name="settings.sync_wifi_summary">Only sync while on wifi</string>

 

 	<string name="shuffle.title">Shuffle By</string>

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

diff --git a/res/xml/authenticator.xml b/res/xml/authenticator.xml
new file mode 100644
index 00000000..ce62b117
--- /dev/null
+++ b/res/xml/authenticator.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>

+<account-authenticator

+	xmlns:android="http://schemas.android.com/apk/res/android"

+	android:accountType="subsonic.org"

+	android:icon="@drawable/launch"

+	android:smallIcon="@drawable/launch"

+	android:label="@string/common.appname"/>
\ No newline at end of file
diff --git a/res/xml/playlists_syncadapter.xml b/res/xml/playlists_syncadapter.xml
new file mode 100644
index 00000000..418f3f49
--- /dev/null
+++ b/res/xml/playlists_syncadapter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"

+	android:contentAuthority="github.daneren2005.dsub.playlists.provider"

+	android:accountType="subsonic.org"

+	android:userVisible="true"

+	android:supportsUploading="false"

+	android:allowParallelSyncs="false"

+	android:isAlwaysSyncable="true"/>
\ No newline at end of file
diff --git a/res/xml/podcasts_syncadapter.xml b/res/xml/podcasts_syncadapter.xml
new file mode 100644
index 00000000..21f421f6
--- /dev/null
+++ b/res/xml/podcasts_syncadapter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"

+	android:contentAuthority="github.daneren2005.dsub.podcasts.provider"

+	android:accountType="subsonic.org"

+	android:userVisible="true"

+	android:supportsUploading="false"

+	android:allowParallelSyncs="false"

+	android:isAlwaysSyncable="true"/>
\ No newline at end of file
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 99233785..6756a5d8 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -172,6 +172,29 @@
 		</PreferenceCategory>
 
 		<PreferenceCategory
+			android:title="@string/settings.sync_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.sync_enabled"
+				android:summary="@string/settings.sync_enabled_summary"
+				android:key="syncEnabled"
+				android:defaultValue="true"/>
+
+			<ListPreference
+				android:title="@string/settings.sync_interval"
+				android:key="syncInterval"
+				android:defaultValue="60"
+				android:entryValues="@array/syncIntervalValues"
+				android:entries="@array/syncIntervalNames"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.sync_wifi"
+				android:summary="@string/settings.sync_wifi_summary"
+				android:key="syncWifi"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
 			android:title="@string/settings.other_title">
 
 			<CheckBoxPreference