diff --git a/res/drawable-hdpi/device_access_time.png b/res/drawable-hdpi/device_access_time.png
new file mode 100644
index 000000000..001549f38
Binary files /dev/null and b/res/drawable-hdpi/device_access_time.png differ
diff --git a/res/drawable-mdpi/device_access_time.png b/res/drawable-mdpi/device_access_time.png
new file mode 100644
index 000000000..de9b4fb2a
Binary files /dev/null and b/res/drawable-mdpi/device_access_time.png differ
diff --git a/res/drawable-xhdpi/device_access_time.png b/res/drawable-xhdpi/device_access_time.png
new file mode 100644
index 000000000..2beae08c3
Binary files /dev/null and b/res/drawable-xhdpi/device_access_time.png differ
diff --git a/res/layout/time_dialog.xml b/res/layout/time_dialog.xml
new file mode 100644
index 000000000..67ce498cb
--- /dev/null
+++ b/res/layout/time_dialog.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/menu/mediaplayer.xml b/res/menu/mediaplayer.xml
index 3f1aa117e..13f6b4d0d 100644
--- a/res/menu/mediaplayer.xml
+++ b/res/menu/mediaplayer.xml
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 944d17bb7..02f50042b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -153,6 +153,9 @@
Export error
Opml export successful.
The .opml file was written to:\u0020
+ Set sleep timer
+ Disable sleep timer
+ Enter time here
\ No newline at end of file
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index bb8d50f61..81ebceb62 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -142,6 +142,11 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements
media != null && media.getItem().getLink() != null);
menu.findItem(R.id.visit_website_item).setVisible(
media != null && media.getItem().getLink() != null);
+
+ boolean sleepTimerSet = playbackService != null && playbackService.sleepTimerActive();
+ boolean sleepTimerNotSet = playbackService != null && !playbackService.sleepTimerActive();
+ menu.findItem(R.id.set_sleeptimer_item).setVisible(sleepTimerNotSet);
+ menu.findItem(R.id.disable_sleeptimer_item).setVisible(sleepTimerSet);
return true;
}
diff --git a/src/de/danoeh/antennapod/dialog/TimeDialog.java b/src/de/danoeh/antennapod/dialog/TimeDialog.java
new file mode 100644
index 000000000..4f820eafb
--- /dev/null
+++ b/src/de/danoeh/antennapod/dialog/TimeDialog.java
@@ -0,0 +1,73 @@
+package de.danoeh.antennapod.dialog;
+
+import java.util.concurrent.TimeUnit;
+
+import de.danoeh.antennapod.R;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Spinner;
+
+public abstract class TimeDialog extends Dialog {
+ private int leftButtonTextId;
+ private int titleTextId;
+
+ private EditText etxtTime;
+ private Spinner spTimeUnit;
+ private Button butConfirm;
+ private Button butCancel;
+
+ private String[] spinnerContent = { "min", "h" };
+ private TimeUnit[] units = { TimeUnit.MINUTES, TimeUnit.HOURS };
+
+ public TimeDialog(Context context, int TitleTextId, int leftButtonTextId) {
+ super(context);
+ this.leftButtonTextId = leftButtonTextId;
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.time_dialog);
+ etxtTime = (EditText) findViewById(R.id.etxtTime);
+ spTimeUnit = (Spinner) findViewById(R.id.spTimeUnit);
+ butConfirm = (Button) findViewById(R.id.butConfirm);
+ butCancel = (Button) findViewById(R.id.butCancel);
+ butConfirm.setText(leftButtonTextId);
+ butCancel.setText(R.string.cancel_label);
+ setTitle(titleTextId);
+ spTimeUnit.setAdapter(new ArrayAdapter(this.getContext(), 0,
+ spinnerContent));
+ butCancel.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ dismiss();
+ }
+ });
+ butConfirm.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ dismiss();
+ onTimeEntered(readTimeMillis());
+ }
+ });
+
+ }
+
+ public abstract void onTimeEntered(long millis);
+
+ private long readTimeMillis() {
+ TimeUnit selectedUnit = units[spTimeUnit.getSelectedItemPosition()];
+ long value = Long.valueOf(etxtTime.getText().toString());
+ return selectedUnit.toMillis(value);
+ }
+
+}
diff --git a/src/de/danoeh/antennapod/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java
index f991ffbe1..f1328f23e 100644
--- a/src/de/danoeh/antennapod/service/PlaybackService.java
+++ b/src/de/danoeh/antennapod/service/PlaybackService.java
@@ -70,10 +70,13 @@ public class PlaybackService extends Service {
public static final int NOTIFICATION_TYPE_INFO = 1;
public static final int NOTIFICATION_TYPE_BUFFER_UPDATE = 2;
public static final int NOTIFICATION_TYPE_RELOAD = 3;
+ public static final int NOTIFICATION_TYPE_SLEEPTIMER_UPDATE = 4;
/** Is true if service is running. */
public static boolean isRunning = false;
+ private SleepTimer sleepTimer;
+
private static final int NOTIFICATION_ID = 1;
private NotificationCompat.Builder notificationBuilder;
@@ -134,6 +137,7 @@ public class PlaybackService extends Service {
public void onDestroy() {
super.onDestroy();
isRunning = false;
+ disableSleepTimer();
unregisterReceiver(headsetDisconnected);
if (AppConfig.DEBUG)
Log.d(TAG, "Service is about to be destroyed");
@@ -454,6 +458,25 @@ public class PlaybackService extends Service {
}
};
+ public void setSleepTimer(long waitingTime) {
+ if (sleepTimer != null) {
+ sleepTimer.interrupt();
+ }
+ sleepTimer = new SleepTimer(waitingTime);
+ sleepTimer.start();
+ sendNotificationBroadcast(NOTIFICATION_TYPE_SLEEPTIMER_UPDATE, 0);
+ }
+
+ public void disableSleepTimer() {
+ if (sleepTimer != null) {
+ if (AppConfig.DEBUG)
+ Log.d(TAG, "Disabling sleep timer");
+ sleepTimer.interrupt();
+ sleepTimer = null;
+ sendNotificationBroadcast(NOTIFICATION_TYPE_SLEEPTIMER_UPDATE, 0);
+ }
+ }
+
/**
* Saves the current position and pauses playback
*
@@ -591,6 +614,7 @@ public class PlaybackService extends Service {
}
}
+ @SuppressLint("NewApi")
private void setupWidgetUpdater() {
if (widgetUpdater == null || widgetUpdater.isCancelled()) {
widgetUpdater = new WidgetUpdateWorker();
@@ -608,6 +632,10 @@ public class PlaybackService extends Service {
PlaybackService.this.sendBroadcast(new Intent(
PlayerWidget.FORCE_WIDGET_UPDATE));
}
+
+ public boolean sleepTimerActive() {
+ return sleepTimer == null || sleepTimer.isWaiting();
+ }
/**
* Pauses playback when the headset is disconnected and the preference is
@@ -660,7 +688,7 @@ public class PlaybackService extends Service {
} catch (InterruptedException e) {
if (AppConfig.DEBUG)
Log.d(TAG,
- "Thread was interrupted while waiting. Finishing now...");
+ "Threżad was interrupted while waiting. Finishing now...");
return null;
} catch (IllegalStateException e) {
if (AppConfig.DEBUG)
@@ -699,6 +727,44 @@ public class PlaybackService extends Service {
}
+ /** Sleeps for a given time and then pauses playback. */
+ class SleepTimer extends Thread {
+ private static final String TAG = "SleepTimer";
+ private long waitingTime;
+ private boolean isWaiting;
+
+ public SleepTimer(long waitingTime) {
+ super();
+ this.waitingTime = waitingTime;
+ }
+
+ @Override
+ public void run() {
+ isWaiting = true;
+ if (AppConfig.DEBUG)
+ Log.d(TAG, "Starting");
+ try {
+ Thread.sleep(waitingTime);
+ if (status == PlayerStatus.PLAYING) {
+ Log.d(TAG, "Pausing playback");
+ pause(true);
+ }
+ } catch (InterruptedException e) {
+ Log.d(TAG, "Thread was interrupted while waiting");
+ }
+ isWaiting = false;
+ }
+
+ public long getWaitingTime() {
+ return waitingTime;
+ }
+
+ public boolean isWaiting() {
+ return isWaiting;
+ }
+
+ }
+
public boolean isPlayingVideo() {
return playingVideo;
}