Skip to content

Commit fffc458

Browse files
author
Sid Zi
committed
audio pausing on headphone disconnect + spelling improvements
1 parent c7b8fd9 commit fffc458

File tree

7 files changed

+49
-8
lines changed

7 files changed

+49
-8
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,18 @@
3434

3535
<service android:name=".services.MusicPlayerService" />
3636

37-
<receiver android:name=".recievers.MediaButtonHandler">
37+
<receiver android:name=".receivers.MediaButtonHandler">
3838
<intent-filter android:priority="999">
3939
<action android:name="android.intent.action.MEDIA_BUTTON" />
4040
</intent-filter>
4141
</receiver>
4242

43+
<receiver android:name=".receivers.AudioOutputChangeReceiver">
44+
<intent-filter>
45+
<action android:name="android.media.AUDIO_BECOMING_NOISY" />
46+
</intent-filter>
47+
</receiver>
48+
4349
<activity
4450
android:name=".ui.EosActivity"
4551
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -52,7 +58,7 @@
5258
android:theme="@style/AppTheme.NoActionBar" />
5359
<activity android:name=".ui.AlarmSettingActivity" />
5460

55-
<receiver android:name=".recievers.AlarmReciever" />
61+
<receiver android:name=".receivers.AlarmReceiver" />
5662

5763
<activity
5864
android:name=".ui.AlarmActivity"

app/src/main/java/com/sidzi/circleofmusic/recievers/AlarmReciever.java renamed to app/src/main/java/com/sidzi/circleofmusic/receivers/AlarmReceiver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.sidzi.circleofmusic.recievers;
1+
package com.sidzi.circleofmusic.receivers;
22

33
import android.content.BroadcastReceiver;
44
import android.content.Context;
55
import android.content.Intent;
66

7-
public class AlarmReciever extends BroadcastReceiver {
7+
public class AlarmReceiver extends BroadcastReceiver {
88
@Override
99
public void onReceive(Context context, Intent intent) {
1010
System.out.print(":");
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.sidzi.circleofmusic.receivers;
2+
3+
4+
import android.content.BroadcastReceiver;
5+
import android.content.Context;
6+
import android.content.Intent;
7+
import android.media.AudioManager;
8+
9+
import com.sidzi.circleofmusic.services.MusicPlayerService;
10+
11+
public class AudioOutputChangeReceiver extends BroadcastReceiver {
12+
@Override
13+
public void onReceive(final Context context, Intent intent) {
14+
if (intent.getAction().equals(
15+
AudioManager.ACTION_AUDIO_BECOMING_NOISY)) {
16+
// signal service to stop playback
17+
if (MusicPlayerService.PLAYING_TRACK != null) {
18+
Intent i = new Intent(context, MusicPlayerService.class);
19+
i.setAction(MusicPlayerService.ACTION_PAUSE);
20+
context.startService(i);
21+
}
22+
}
23+
}
24+
}

app/src/main/java/com/sidzi/circleofmusic/recievers/MediaButtonHandler.java renamed to app/src/main/java/com/sidzi/circleofmusic/receivers/MediaButtonHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sidzi.circleofmusic.recievers;
1+
package com.sidzi.circleofmusic.receivers;
22

33
import android.content.BroadcastReceiver;
44
import android.content.Context;

app/src/main/java/com/sidzi/circleofmusic/recievers/MusicPlayerViewHandler.java renamed to app/src/main/java/com/sidzi/circleofmusic/receivers/MusicPlayerViewHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sidzi.circleofmusic.recievers;
1+
package com.sidzi.circleofmusic.receivers;
22

33
import android.app.NotificationManager;
44
import android.app.PendingIntent;

app/src/main/java/com/sidzi/circleofmusic/services/MusicPlayerService.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,17 @@ public class MusicPlayerService extends Service {
4141
private Context mContext;
4242
private int songsTillSleep = -1;
4343

44+
@Override
45+
public int onStartCommand(Intent intent, int flags, int startId) {
46+
try {
47+
if (ACTION_PAUSE.equals(intent.getAction())) {
48+
pause();
49+
}
50+
} catch (NullPointerException ignore) {
51+
}
52+
return super.onStartCommand(intent, flags, startId);
53+
}
54+
4455
@Override
4556
public void onCreate() {
4657
super.onCreate();

app/src/main/java/com/sidzi/circleofmusic/ui/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
import com.sidzi.circleofmusic.fragments.TheFifthFragment;
5151
import com.sidzi.circleofmusic.helpers.BucketSaver;
5252
import com.sidzi.circleofmusic.helpers.DatabaseSynchronization;
53-
import com.sidzi.circleofmusic.recievers.MediaButtonHandler;
54-
import com.sidzi.circleofmusic.recievers.MusicPlayerViewHandler;
53+
import com.sidzi.circleofmusic.receivers.MediaButtonHandler;
54+
import com.sidzi.circleofmusic.receivers.MusicPlayerViewHandler;
5555
import com.sidzi.circleofmusic.services.MusicPlayerService;
5656

5757
import org.json.JSONException;

0 commit comments

Comments
 (0)