tim/HypoAlarm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

- If user is in a phone call, they're already awake, so ignore the alarm and reset it for tomorrow.

Browse Source
This commit is contained in:
Timothy Allen 2014-04-13 23:59:16 +02:00
parent 4c1e6a5a1a
commit 36b796fd13
4 changed files with 34 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HypoAlarm/src/main/AndroidManifest.xml
View File

@ -50,6 +50,8 @@
<!-- permission required to read contacts -->
<uses-permission android:name="android.permission.READ_CONTACTS" />
<!-- permission required to tell if a phone call is active -->
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<!-- permission required to set an alarm -->
<uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
<!-- permission required to Send SMS -->

14
HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmKlaxon.java
View File

@ -27,10 +27,7 @@ public class AlarmKlaxon {
/**
*
* TODO allow user to select alarm tone
* TODO add raw alarm tone to use as fallback
* TODO add in-call alarm tone
* TODO lower volume if in a call
* TODO cancel noise if a call comes in (add TelephonyManager listener which cancels the alert but calls the notification)
* TODO prevent alarm from being ignored or snoozing if a call comes in?
*
*/
@ -40,6 +37,7 @@ public class AlarmKlaxon {
telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
initialCallState = telephonyManager.getCallState();
boolean inTelephoneCall = initialCallState != TelephonyManager.CALL_STATE_IDLE;
phoneStateListener = new PhoneStateListener() {
@Override
public void onCallStateChanged(int state, String ignored) {
@ -49,12 +47,10 @@ public class AlarmKlaxon {
// we don't kill the alarm during a call.
if (state != TelephonyManager.CALL_STATE_IDLE && state != initialCallState) {
stopAudio(context);
// TODO stop alarm from snoozing or turning off?
}
}
};
telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
boolean inTelephoneCall = initialCallState != TelephonyManager.CALL_STATE_IDLE;
// TODO select alarm tone?
// Use the default alarm tone...
@ -65,7 +61,7 @@ public class AlarmKlaxon {
mediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
@Override
public boolean onError(MediaPlayer mp, int what, int extra) {
Log.e("AlarmAlertActivity", "Error occurred while playing audio. Stopping alarm.");
Log.e("AlarmKlaxon", "Error occurred while playing audio. Stopping alarm.");
stopAudio(context);
return true;
}
@ -90,10 +86,9 @@ public class AlarmKlaxon {
startAudio(context);
} catch (Exception ex2) {
// At this point we just don't play anything.
Log.e("AlarmAlertActivity", "Failed to play fallback ringtone", ex2);
Log.e("AlarmKlaxon", "Failed to play fallback ringtone", ex2);
}
}
}
public static void stop(final Context context) {
@ -138,5 +133,4 @@ public class AlarmKlaxon {
afd.close();
}
}
}

17
HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmReceiver.java
View File

@ -17,11 +17,6 @@ import android.widget.Toast;
import java.io.IOException;
import java.util.Calendar;
/**
* TODO change alarm state if a phone call comes in
*/
public class AlarmReceiver extends BroadcastReceiver {
private static final int SNOOZE_TIME = 1000*60; //1000*60*5; // Snooze for 5 minutes if need be
private static final int ALERT_LIFE = 1000*10; //TODO 1000*60*2; // 2 minutes
@ -52,16 +47,9 @@ public class AlarmReceiver extends BroadcastReceiver {
// Cancel the pre-alarm notification, if it exists
context.stopService(new Intent(context, PreAlarmNotify.class));
// TODO: delay the alarm if user is in a phone call, until the phone call ends
// If dialing, active in a phone call, or on hold, don't bother with the alarm, just reset it for tomorrow
telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
// If in a phone call, delay the alarm until the call ends
while (telephonyManager.getCallState() != TelephonyManager.CALL_STATE_IDLE) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
Log.e("AlarmReceiver", "Error sleeping: " + e.toString());
}
}
if (telephonyManager.getCallState() != TelephonyManager.CALL_STATE_OFFHOOK) {
// Set a grace period alarm to send SMS
Calendar graceCal = Calendar.getInstance();
@ -89,6 +77,7 @@ public class AlarmReceiver extends BroadcastReceiver {
// Allow user to acknowledge alarm and cancel grace alarm
startAlert(context);
}
// Reset for tomorrow; as of API 19, setRepeating() is inexact, so we use setExact()
Calendar cal = MainActivity.TimeStringToCalendar(alarmTimeStr);

2
HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/MainActivity.java
View File

@ -56,8 +56,6 @@ import java.util.regex.Pattern;
// More than one phone number?
// Alerts via Whatsapp and other protocols?
// TODO: klaxon
public class MainActivity extends ActionBarActivity {
public static int ALARM_REQUEST = 1;
public static int GRACE_REQUEST = 2;