Alarm: don't cancel alarm on activity destroy, change debug tags

jeluchu · Mar 24, 2017 · 3bba6d0 · 3bba6d0
1 parent 9d5d317
commit 3bba6d0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/app/src/main/java/com/example/yink/amadeus/Alarm.java b/app/src/main/java/com/example/yink/amadeus/Alarm.java
@@ -9,6 +9,7 @@
 import android.media.MediaPlayer;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
+import android.util.Log;
 
 class Alarm {
 
@@ -19,6 +20,7 @@ class Alarm {
     static final int ALARM_ID = 104859;
     static final int ALARM_NOTIFICATION_ID = 102434;
 
+    private static final String TAG = "Alarm";
     private static boolean isPlaying = false;
 
     static void start(Context context, int ringtone) {
@@ -40,6 +42,8 @@ static void start(Context context, int ringtone) {
             isPlaying = true;
         }
 
+        Log.d(TAG, "Start");
+
     }
 
     static void cancel(Context context) {
@@ -55,15 +59,17 @@ static void cancel(Context context) {
             editor.putBoolean("alarm_toggle", false);
             editor.apply();
             m.release();
+            notificationManager.cancel(ALARM_NOTIFICATION_ID);
+            alarmManager.cancel(pendingIntent);
             isPlaying = false;
         }
 
-        notificationManager.cancel(ALARM_NOTIFICATION_ID);
-        alarmManager.cancel(pendingIntent);
         if (v != null) {
             v.cancel();
         }
 
+        Log.d(TAG, "Cancel");
+
     }
 
     static boolean isPlaying() {

diff --git a/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java b/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
@@ -19,7 +19,7 @@
 
 public class AlarmActivity extends AppCompatActivity {
 
-    private final String TAG = "Amadeus.AlarmActivity";
+    private final String TAG = "AlarmActivity";
 
     private AlarmManager alarmManager;
     private PendingIntent pendingIntent;
@@ -35,7 +35,7 @@ protected void onCreate(Bundle savedInstanceState) {
         alarmTimePicker = (TimePicker) findViewById(R.id.alarmTimePicker);
         alarmToggle = (ToggleButton) findViewById(R.id.alarmToggle);
         alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
-        pendingIntent = PendingIntent.getBroadcast(this, Alarm.ALARM_ID, new Intent(this, AlarmReceiver.class), 0);
+        pendingIntent = PendingIntent.getBroadcast(this, Alarm.ALARM_ID, new Intent(this, AlarmReceiver.class), PendingIntent.FLAG_CANCEL_CURRENT);
 
         alarmTimePicker.setIs24HourView(settings.getBoolean("24-hour_format", true));
 

diff --git a/app/src/main/java/com/example/yink/amadeus/AlarmBootReceiver.java b/app/src/main/java/com/example/yink/amadeus/AlarmBootReceiver.java
@@ -12,7 +12,7 @@
 
 public class AlarmBootReceiver extends WakefulBroadcastReceiver {
 
-    final String TAG = "A.AlarmBootReceiver";
+    final String TAG = "AlarmBootReceiver";
 
     @Override
     public void onReceive(Context context, Intent intent) {

diff --git a/app/src/main/java/com/example/yink/amadeus/AlarmReceiver.java b/app/src/main/java/com/example/yink/amadeus/AlarmReceiver.java
@@ -7,12 +7,17 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.v4.content.WakefulBroadcastReceiver;
+import android.util.Log;
 
 public class AlarmReceiver extends WakefulBroadcastReceiver {
 
+    private final String TAG = "AlarmReceiver";
+
     @Override
     public void onReceive(Context context, Intent intent) {
 
+        Log.d(TAG, "Broadcast received!");
+
         int[] ringtones = {
                 R.raw.ringtone_gate_of_steiner, R.raw.ringtone_village,
                 R.raw.ringtone_beginning_of_fight, R.raw.ringtone_easygoingness,
@@ -23,6 +28,8 @@ public void onReceive(Context context, Intent intent) {
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
         int index = Integer.parseInt(settings.getString("ringtone", "0"));
 
+        Log.d(TAG, "Starting alarm...");
+
         Alarm.start(context, ringtones[index]);
 
         ComponentName comp = new ComponentName(context.getPackageName(),

diff --git a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java b/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
@@ -34,7 +34,7 @@ public class LaunchActivity extends AppCompatActivity {
         public void run() {
             final int DURATION = 20;
             if (i < 39) {
-                i += 1;
+                i++;
                 String imgName = "logo" + Integer.toString(i);
                 int id = getResources().getIdentifier(imgName, "drawable", getPackageName());
                 logo.setImageDrawable((ContextCompat.getDrawable(LaunchActivity.this, id)));

diff --git a/app/src/main/java/com/example/yink/amadeus/MainActivity.java b/app/src/main/java/com/example/yink/amadeus/MainActivity.java
@@ -39,7 +39,7 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    private final String TAG = "Amadeus";
+    private final String TAG = "MainActivity";
 
     private TextView subtitles;
     private ImageView kurisu;
@@ -460,7 +460,7 @@ private void answerSpeech(String input, Context context) {
 
     private class listener implements RecognitionListener {
 
-        private final String TAG = "Amadeus.listener";
+        private final String TAG = "VoiceListener";
 
         public void onReadyForSpeech(Bundle params) {
             Log.d(TAG, "Speech recognition start");