android-ibc-forum

commit c83c057b5f293fda5aec8d684b9996a52e7d6b70
parent 584eb15ec17b4dde5766d616021d4985751e5376
Author: Jan Dankert <devnull@localhost>
Date:   Sun, 12 Feb 2012 20:38:57 +0100

Neu: Alarmton für Abodienst auswählbar

Diffstat:
res/values/strings.xml
 | 
3
++-
res/xml/preferences.xml
 | 
3
+++
src/de/mtbnews/android/service/SubscriptionService.java
 | 
15
+++++++++++----

3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+ 
 	<string name="canceled">Abgebrochen</string>
 	<string name="more">Mehr</string>
 	<string name="sub_only">Forum enthält keine Themen</string>
@@ -156,6 +156,7 @@
 	<string name="mode">Modus</string>
 	<string name="vibration">Vibration</string>
 	<string name="vibration_desc">Vibrationsalarm bei neuen Nachrichten</string>
+	<string name="ringtone">Ton</string>
 
 
 	<string name="interval">Intervall</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -66,6 +66,9 @@
 			android:entries="@array/interval_list_label" android:entryValues="@array/interval_list"
 			android:key="subscription_service_interval" android:title="@string/interval"
 			android:dependency="autostart_subscription_service" />
+		<RingtonePreference android:key="ringtone"
+			android:showSilent="true" android:showDefault="true"
+			android:ringtoneType="notification" android:title="@string/ringtone" />
 		<CheckBoxPreference android:defaultValue="false"
 			android:key="use_vibration" android:summary="@string/vibration_desc"
 			android:title="@string/vibration" android:dependency="autostart_subscription_service" />
diff --git a/src/de/mtbnews/android/service/SubscriptionService.java b/src/de/mtbnews/android/service/SubscriptionService.java
@@ -15,11 +15,13 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
-import de.mtbnews.android.IBCActivity;
 import de.mtbnews.android.MailboxActivity;
 import de.mtbnews.android.R;
 import de.mtbnews.android.SubscriptionForenActivity;
@@ -31,7 +33,6 @@ import de.mtbnews.android.tapatalk.wrapper.ListHolder;
 import de.mtbnews.android.tapatalk.wrapper.Mailbox;
 import de.mtbnews.android.tapatalk.wrapper.Topic;
 import de.mtbnews.android.util.IBC;
-import de.mtbnews.android.util.Utils;
 
 /**
  * Hintergrund-Service, der ungelesene Nachrichten, Themen und Beiträge
@@ -307,8 +308,14 @@ public class SubscriptionService extends Service
 						+ (titleExtra != null ? " " + titleExtra : ""),
 						content, intent);
 
-		notification.defaults = Notification.DEFAULT_LIGHTS
-				| Notification.DEFAULT_SOUND;
+		notification.defaults = Notification.DEFAULT_LIGHTS;
+
+		final String ringtone = prefs.getString("ringtone", "");
+
+		if (!TextUtils.isEmpty(ringtone))
+			notification.sound = Uri.parse(ringtone);
+		else
+			notification.defaults |= Notification.DEFAULT_SOUND;
 
 		// Falls so konfiguriert, den Vibrationsalarm auslösen
 		if (prefs.getBoolean("use_vibration", false))