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

Merge branch 'bugfix/android10_completion_sound' into 'master' 

Fix late playing completion sound (Android 10)

Closes #62

See merge request tslocum/meditationassistant!5
merge-requests/7/head
Trevor Slocum 2020-09-24 16:03:32 +00:00
parent 3bc4338959 48dd79b539
commit fe9da0c854
3 changed files with 4 additions and 8 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);

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

@ -674,7 +674,7 @@ public class MeditationAssistant extends Application {
// Vibrate device
if (!skipVibration) {
String vibration = prefs.getString("pref_meditation_vibrate_" + label, "");
if (!vibration.equals("none")) {
if (!vibration.isEmpty()) {
if (vibration.equals("custom")) {
vibrateDevice(prefs.getString("pref_meditation_vibrate_" + label + "_custom", ""));
} else {