tslocum
/
meditationassistant
1
2
Fork 0
Code Issues 27 Pull Requests Releases Activity

MainActivity: Play completion sound from alarm intent 

On Android 10 (at least), the CompleteActivity is not started until the
app is activated again, so this fixes the problem where no completion sound
is played while the phone is asleep.

Closes #62
merge-requests/7/head
Angus Gratton 2020-09-24 21:13:44 +10:00
parent 47827463f9
commit 48dd79b539
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/CompleteActivity.java
View File

@ -145,10 +145,7 @@ public class CompleteActivity extends Activity {
break;
}
String finishSoundPath = getMeditationAssistant().getPrefs().getString("pref_meditation_sound_finish", "");
if (!manual) {
getMeditationAssistant().notifySession(2, false, false);
} else {
if (manual) {
getMeditationAssistant().restoreVolume();
}
} else {

5
MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MainActivity.java
View File

@ -1889,9 +1889,8 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
}
if (fullWakeUp) {
if (getMeditationAssistant().getPrefs().getBoolean("pref_softfinish", false)) {
getMeditationAssistant().notifySession(2, false, false);
} else {
getMeditationAssistant().notifySession(2, false, false);
if (!getMeditationAssistant().getPrefs().getBoolean("pref_softfinish", false)) {
Intent openAlarmReceiverActivity = new Intent(getApplicationContext(), CompleteActivity.class);
openAlarmReceiverActivity.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
openAlarmReceiverActivity.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);