rixty
/
Amadeus
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Alarm: rename class file, fix bug when alarm failed to set up, fix RuntimeException on activity launch

This commit is contained in:
Snek 2017-03-23 11:46:46 +03:00
parent 16cba6f981
commit 496e530761
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/example/yink/amadeus/Alarm.java
View File

@ -46,7 +46,6 @@ class Alarm {
settings = PreferenceManager.getDefaultSharedPreferences(context);
AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
//v = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
Intent alarmIntent = new Intent(context, AlarmReceiver.class);
final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, ALARM_ID, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
@ -61,7 +60,6 @@ class Alarm {
notificationManager.cancel(ALARM_NOTIFICATION_ID);
alarmManager.cancel(pendingIntent);
//if (settings.getBoolean("vibrate", false)) {
if (v != null) {
v.cancel();
}

5
app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
View File

@ -19,7 +19,7 @@ import java.util.Calendar;
public class AlarmActivity extends AppCompatActivity {
private final String TAG = "Amadeus.Alarm";
private final String TAG = "Amadeus.AlarmActivity";
private AlarmManager alarmManager;
private PendingIntent pendingIntent;
@ -35,8 +35,7 @@ public class AlarmActivity extends AppCompatActivity {
alarmTimePicker = (TimePicker) findViewById(R.id.alarmTimePicker);
alarmToggle = (ToggleButton) findViewById(R.id.alarmToggle);
alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
Intent alarmIntent = new Intent(this, AlarmReceiver.class);
pendingIntent = PendingIntent.getBroadcast(this, Alarm.ALARM_ID, alarmIntent, PendingIntent.FLAG_NO_CREATE);
pendingIntent = PendingIntent.getBroadcast(this, Alarm.ALARM_ID, new Intent(this, AlarmReceiver.class), 0);
alarmTimePicker.setIs24HourView(settings.getBoolean("24-hour_format", true));

1
app/src/main/java/com/example/yink/amadeus/AlarmService.java
View File

@ -17,6 +17,7 @@ public class AlarmService extends IntentService {
protected void onHandleIntent(Intent intent) {
sendNotification(getString(R.string.incoming_call));
Intent launch = new Intent(this, LaunchActivity.class);
launch.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(launch);
AlarmReceiver.completeWakefulIntent(intent);
}