Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
abertschi committed Oct 30, 2019
2 parents 147edeb + 9219aa0 commit 90ee86b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog / Ad-Free
### v1.1, (unreleased)

### v1.1
- Add support for miui based devices
- introduce global error handler and option for email bug report on crash
- introduce sc ad detection
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ Detector which inspects Spotify notifications for properties set in the track na
- `NotificationBundleAndroidTextDetector`:
Detector which checks for properties set in the notification bundle.

- [More](https://github.com/abertschi/ad-free/tree/master/app/src/main/java/ch/abertschi/adfree/detector)

### Ad blocking
[AudioManager](https://developer.android.com/reference/android/media/AudioManager.html), Android's Audio System provides several streams on which audio can be played. Spotify, alike many music players, plays audio on the stream [STREAM_MUSIC](https://developer.android.com/reference/android/media/AudioManager.html#STREAM_MUSIC). In case of ad detection, Ad Free mutes _STREAM MUSIC_ and calls a configured [AdPlugin](./app/src/main/java/ch/abertschi/adfree/plugin/AdPlugin.kt). `AdPlugins` aim to replace Spotify's advertisement. They play music on an alternative stream and are therefore not affected by the mute of _STREAM MUSIC_.

Expand All @@ -54,8 +56,6 @@ Tested with the following Spotify versions
- 2017-09-01: 8.4.17.640 armV7
- 2017-11-28: 8.4.24.875 armV7

This app is optimized to work on Android 6.0.1 as my phone runs on Android 6.0.1. If you notice problems on a newer version of Android, please fill an issue and we try to tackle down the problem together.

## Release notes
- See [Changelog](./CHANGELOG.md)
## Credits
Expand Down

0 comments on commit 90ee86b

Please sign in to comment.